Update
Merge branch 'master' of https://github.com/Nicohockey/TechU_Me_App.git

Conflicts:
	TechUMeApp/gen/com/cakewire/techumeapp/R.java
Merge branch 'master' of https://github.com/Nicohockey/TechU_Me_App.git

Conflicts:
	TechUMeApp/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/Nicohockey/TechU_Me_App.git

Conflicts:
	TechUMeApp/.settings/org.eclipse.jdt.core.prefs
Merge branch 'master' of https://github.com/Nicohockey/TechU_Me_App.git
Changed activity_main.xml
Merge branch 'master' of https://github.com/Nicohockey/TechU_Me_App.git