Main Activity Buttons working
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/dlsu/savant/MainActivity.class