Merge pull request #28 from DaveSoftLLC/Merge-Code

Merge code
DaveSoftLLC · Jun 14, 2018 · ffdb7d2 · ffdb7d2
2 parents c30acd4 + f4ef18a
commit ffdb7d2
Show file tree

Hide file tree

Showing 49 changed files with 757 additions and 24,636 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 
 .DS_Store
+.cpython-36.pyc
+*.pyc
+__pycache__/BaseGame.cpython-36.pyc
+*.pyc
diff --git a/Background/MapFinal.png b/Background/MapFinal.png
diff --git a/Background/MapFinal.psd b/Background/MapFinal.psd
diff --git a/Background/buildings.png b/Background/buildings.png