Last Commit
Merge branch 'master' of https://github.com/tmhsatori/SATORI-WEBSITE

Conflicts:
	index.html
	sass/screen.scss
	stylesheets/screen.css