Update with previous amends
Merge branch 'master' of https://github.com/aaronsylvester/mas-d

Conflicts:
	index.html
	js/main.js