add homepage again
Merge branch 'master' of https://github.com/9gix/nus-sprint

Conflicts:
	res/layout/activity_main.xml
	res/menu/main.xml
	res/values/dimens.xml
	src/org/ggix/nussprint/MainActivity.java