Code changes, comments to Home Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fete/app/src/main/java/com/group9/fete/HomePage.java
Merge branch 'master' of https://github.com/allysin/Fete