small update
Merge branch 'master' of
https://github.com/Chalkboard123/TechU_Me_App.git

Conflicts:
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$id.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$layout.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$menu.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$string.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$style.class
	TechUMeApp/gen/com/MetalJourny/techumeapp/R.java
	TechUMeApp/res/layout/activity_main.xml
Merge branch 'master' of
https://github.com/Chalkboard123/TechU_Me_App.git

Conflicts:
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$attr.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$dimen.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$drawable.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$id.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$layout.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$menu.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$string.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$style.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R.class
	TechUMeApp/gen/com/MetalJourny/techumeapp/R.java
	TechUMeApp/res/layout/activity_main.xml