local commit
Merge branch 'master' of git@github.com:ZeroNotOne/Flyrator.git

Conflicts:
	src/com/zno/flyrator/MainActivity.java