...correct message...
Merge branch 'master' of https://github.com/duartec003/cps630

Conflicts:
	CPS630App/bin/classes/com/mod/cps630app/R$id.class
	CPS630App/bin/classes/com/mod/cps630app/R$layout.class
	CPS630App/bin/classes/com/mod/cps630app/R$string.class
	CPS630App/bin/classes/com/mod/cps630app/R$style.class
	CPS630App/bin/classes/com/mod/cps630app/R$styleable.class
	CPS630App/gen/com/mod/cps630app/R.java