stuff
blah
toMerge
ff
Merge branch 'master' of https://github.com/grid32/ComputingTimetablePlanner

Conflicts:
	bin/R.txt
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/computingtimetableplanner/R$layout.class
	bin/classes/com/example/computingtimetableplanner/R$menu.class
	bin/classes/com/example/computingtimetableplanner/R$string.class
	bin/classes/com/example/computingtimetableplanner/R$style.class
	bin/classes/com/example/computingtimetableplanner/R$styleable.class
	bin/classes/com/example/computingtimetableplanner/StreamActivity.class
	bin/classes/com/example/computingtimetableplanner/UnitActivity.class
	bin/classes/com/example/computingtimetableplanner/UpdateEmail.class
	gen/com/example/computingtimetableplanner/R.java
	res/values/strings.xml
	src/com/example/computingtimetableplanner/UnitActivity.java