Merge branch 'gh-pages' of https://github.com/RohanWu/wp2014s_hw1 into gh-pages

Conflicts:
	wp2014s_hw1.css
Debug