jo
Merge branch 'master' of https://github.com/meikelmosby/finalAndroidApp

Conflicts:
	finalAndroidApp/src/finalAndroidApp/firstclass.java
newest shit