//

//
Merge branch 'master' of https://github.com/mariannabudnikova/googlehackathon2014

Conflicts:
	androidHack/.classpath
	androidHack/bin/AndroidManifest.xml
	androidHack/bin/MazeGoogle2014.apk
	androidHack/bin/R.txt
	androidHack/bin/classes.dex

androidHack/bin/dexedLibs/android-support-v4-88dff3b300acb347396fbd20687
007c2.jar

androidHack/bin/dexedLibs/android-support-v7-appcompat-f0ea7cd7a4644dcdf
4d9ece28088bd9b.jar

androidHack/bin/dexedLibs/appcompat_v7-7d163da85a2b039add7461a7db2a7081.
jar
	androidHack/bin/jarlist.cache
	androidHack/bin/resources.ap_
resolving