Changes made on February 20, 2013
Please add.
resolving week 3 merge
I finished them all, mwhaaaa
functions
Merge branch 'master' of https://github.com/ShelbyMeyerhoff/ccaejs