add grid sep. website.js whooptiedoo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/index.html
	src/scripts/app.js
	src/styles/main.css
Fixes

Final