Merge conflicts

Author: intendednull

.flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length=100
-application_import_names=projectt
+application_import_names=src
 ignore=P102,B311,W503,E226,S311,W504,F821
 exclude=__pycache__, venv, .venv, tests
 import-order-style=pycharm

Pipfile

@@ -9,6 +9,9 @@ pytest = "*"
 
 [packages]
 more-itertools = "*"
+pillow = "*"
+pygame = "*"
+aiohttp = "*"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -1,23 +1,4 @@
-import tkinter as tk
+from .mainwindow import Tinder
 
-from .animate import Motion, Animater, Coord, Direction
-
-root = tk.Tk()
-
-window = Animater(root)
-window.pack()
-
-c1 = Coord(50, 55)
-c2 = Coord(60, 65)
-rect = window.create_rectangle(c1, c2)
-
-end = c1 + Direction.RIGHT * 50
-end2 = end + Direction.DOWN * 50
-end3 = end2 + (Direction.UP + Direction.LEFT) * 50
-
-animation = Motion(window, rect, (end, end2, end3), speed=1)
-
-window.add_motion(animation)
-window.add_event('<B1-Motion>')
-
-root.mainloop()
+if __name__ == "__main__":
+    Tinder().start()