style to the best.

awesome!
Merge branch 'master' of https://github.com/jamesyi/adcdproject1

Conflicts:
	css/styles.css