test
Merge branch 'master' of https://github.com/seantsang/SeanMacBookPro

Conflicts:
	css/style.css
c