Fixing R.java menu and layout.
Merge branch 'master' of https://github.com/k11tj01/sos

Conflicts:
	bin/classes/com/comp489/sos/R$layout.class
	bin/classes/com/comp489/sos/R$menu.class
	bin/classes/com/comp489/sos/R$string.class
	bin/classes/com/comp489/sos/R$style.class
	bin/classes/com/comp489/sos/R.class
	gen/com/comp489/sos/R.java
Modified R.java to remove duplicate instances.