Merged conflicts.

a50c26f9 · Taddeus Kroes · 637b06c2 · 9a6d6428 · a50c26f9 · a50c26f9
Commit a50c26f9 authored 13 years ago by Taddeus Kroes
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.pdf
 *.gz
 *.toc
+main.bat
--- a/main
+++ b/main
+src/main.py
\ No newline at end of file
--- a/main.bat
+++ b/main.bat
-cd src
-C:\Kivy-1.1.1\kivy.bat main.py
\ No newline at end of file
--- a/src/main.py
+++ b/src/main.py