WORKING updated 2/21/14
Merge branch 'master' of https://github.com/jolive/publicCode