stuff
Merge branch 'master' of https://github.com/T-raw/TechU_Me_App.git

Conflicts:
	FocusApp/bin/classes/com/example/focusapp/MainActivity.class
	FocusApp/bin/classes/com/example/focusapp/R$attr.class
	FocusApp/bin/classes/com/example/focusapp/R$dimen.class
	FocusApp/bin/classes/com/example/focusapp/R$drawable.class
	FocusApp/bin/classes/com/example/focusapp/R$id.class
	FocusApp/bin/classes/com/example/focusapp/R$layout.class
	FocusApp/bin/classes/com/example/focusapp/R$menu.class
	FocusApp/bin/classes/com/example/focusapp/R$string.class
	FocusApp/bin/classes/com/example/focusapp/R$style.class
	FocusApp/bin/classes/com/example/focusapp/R.class
	FocusApp/gen/com/example/focusapp/R.java
	FocusApp/res/layout/activity_main.xml