macbook dummy commit
Merge branch 'master' of https://github.com/sdcoffey/StayInTheBlue-and

Conflicts:
	StayInTheBlue/bin/StayInTheBlue.apk
	StayInTheBlue/bin/classes.dex