for walkthrough
wlkthrough 2
Compiled "yay"
Pull to commit (non-fast-forward msg)
Merge branch 'master' of https://github.com/teotc/GroupConnectMain

Conflicts:
	GroupConnect/AndroidManifest.xml
	GroupConnect/res/layout/activity_login.xml
	GroupConnect/res/layout/activity_main.xml
	GroupConnect/res/menu/login.xml
	GroupConnect/res/values/strings.xml
	GroupConnect/res/values/styles.xml
	GroupConnect/src/sg/nyp/groupconnect/Login.java
	GroupConnect/src/sg/nyp/groupconnect/MainActivity.java