Changes made on February 20, 2013
first save at home pc 2-27-13
Merge branch 'master' of https://github.com/gpbrown/ccaejs
Please add.
resolving week 3 merge
I finished them all, mwhaaaa
functions
Merge branch 'master' of https://github.com/ShelbyMeyerhoff/ccaejs
Adding a pointer to CodeAcademy for week 6
Initial commit of week 7 materials.
Adding a little more week 6 content.
from home 3-13-13 5PM
Adding week 7 content
Merge branch 'master' of https://github.com/gpbrown/ccaejs
Updating the front page for week 7.
Merging all content for week 7.