Added more stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/hypetrainstudios/zappit/MainActivity.java
	app/src/main/res/layout/main_activity.xml
Added more stuff