first 3rd mostly done
Merge branch 'master' of http://github.com/JeffNguyen/COGS-187A