still editing info for testing stuff
Merge branch 'master' of https://github.com/cs147win2014/project