testing index change
Merge commit '48b5266288268b4564d5a90eca0b1a99160b0e43'
test
html update 02
Re-added old deleted weeks
Removed wrong index
Added week 7 homework files
Removed homework
added final files
weekend final updates
in class portion
new update with more codes
Merge branch 'final' of https://github.com/kaoriprice/aipdx-wdim268-2013 into final

Conflicts:
	css/style.css
	index.html
Added new images and css
final project finished
Merge branch 'final' into gh-pages

Conflicts:
	css/reset.css
	index.html