I'm Nick and I made buttons
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	OSUMap/src/main/java/com/jkalmeida/osuhack/MainActivity.java
I'm Nick and I made buttons