Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	BussApp Week 2/index.html
	BussApp Week 2/js/main.js