final-exam
Merge branch 'master' of https://github.com/yuki-noji/240-final-starter

Conflicts:
	about.html
	css/mmp-style.css
	images_after/B-7.jpg
	index.html
	scss/_midterm.scss
	scss/pages/_index.scss
commit