committing from mac
Merge branch 'master' of https://github.com/ItsYou/ItsYou.github.io

Conflicts:
	index-aboutme.html
	index-works.html
	stylesheet/index.css
	temp_unit1/stylesheets/index.css