units
added strings
Merge branch 'master' of
https://github.com/Chalkboard123/TechU_Me_App.git

Conflicts:
	TechUMeApp/res/layout/activity_main.xml
	TechUMeApp/res/values/strings.xml
deleted some of our stuff that was not needed
Merge branch 'master' of https://github.com/Chalkboard123/TechU_Me_App.git
Fix one Java reference error