Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/Farelie-game

.gitignore

@@ -0,0 +1,56 @@
+# macOS-related files
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Windows-related files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+[Dd]esktop.ini
+
+#Textfile cruft
+/project.json
+/traceback.txt
+/errors.txt
+/log.txt
+log.txt
+errors.txt
+traceback.txt
+
+
+#Vim swap files
+.sw?
+*~
+*.bak
+
+#save files & cache files
+/game/saves/
+/game/saves/*
+/game/cache/*
+/game/cache
+saves
+tmp
+cache
+env
+
+#binary files
+*.rpyc
+*.rpyb
+*.rpymc
+*.pyc
+*.pyo
+
+#Vim (best text editor) swap files
+.sw?
+
+#binary files
+*.rpyc
+*.rpymc
+
+#backups
+*.bak
+
+#android
+.android.json