Merge origin/master

Conflicts:
	public_html/CSS/style.css
	public_html/CSS/style.css.map
	public_html/SCSS/style.scss
Merge origin/master

Conflicts:
	public_html/index.html