combine all
Merge branch 'master' of https://github.com/abyx/skeleton-group1
combine all
combine all
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/home.html