0000000000000000000000000000000000000000 8ad41f2d4dd3c03af1676e31b0366a51e4ce97ae Matthew <lololirpro@gmail.com> 1413544368 +1300	
8ad41f2d4dd3c03af1676e31b0366a51e4ce97ae 3fe83379cb6d9f42c895be5b708dd6d8cce0023d Matthew <lololirpro@gmail.com> 1413580307 +1300	commit: guy recommened to try renaming application to Application, that had a conflict so I just chucked it as MainApp for conventions sake
3fe83379cb6d9f42c895be5b708dd6d8cce0023d e5ad1eb1cab031259d22910a51ab69921630e10c Matthew <lololirpro@gmail.com> 1413580322 +1300	merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git: Merge made by recursive.
e5ad1eb1cab031259d22910a51ab69921630e10c 3d9d3cd13f6dbbdbf1c159ef6d66b87d16b9369c Matthew <lololirpro@gmail.com> 1413581142 +1300	commit: I didn't change anything...
