Implementing the buttons on the main page.
Finshed implementing the username and user id.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_