Merge branch 'master' into nextButton

Conflicts:
	public/assets/scripts/main.js
	public/assets/styles/main.css
	public/index.html
	src/assets/scripts/main.js
	src/assets/styles/index.sass
	src/index.jade