Itemize displays subtotal
Merge branch 'master' of https://github.com/kdumo/TabShare

Conflicts:
	bin/classes/com/comp380/summer13/group1/tabshare/R$id.class
	bin/classes/com/comp380/summer13/group1/tabshare/R$layout.class
	bin/classes/com/comp380/summer13/group1/tabshare/R$string.class
	bin/classes/com/comp380/summer13/group1/tabshare/R$style.class
	gen/com/comp380/summer13/group1/tabshare/R.java
	res/values/strings.xml