test
Merge branch 'apply_page' of https://github.com/AaronChuo/css-workshop-20140705 into apply_page

Conflicts:
	apply_page/index.html
Merge branch 'gh-pages' into apply_page