new update with more codes
Merge branch 'final' of https://github.com/kaoriprice/aipdx-wdim268-2013 into final

Conflicts:
	css/style.css
	index.html