Update files
Week two project
Merge branch 'gh-pages'

Conflicts:
	BussApp/index.html
Merge remote-tracking branch 'origin/master' into gh-pages