Merge commit '839e648b267dfb66b0309f54bde342a117e8b265' into gh-pages

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