prepping for huroku push
Merge branch 'master' of https://github.com/timsants/CS147-Project