Hopefully fix the commit madness.
Merge remote-tracking branch 'origin/master'

Conflicts:
	OSUMap/src/main/java/com/jkalmeida/osuhack/MainActivity.java
Hopefully fix the commit madness.