fixes
Merge branch 'master' of https://github.com/cameronmccord2/fall2013