Initial project version
Merge branch 'master' of https://code.google.com/p/n966j728-cs680-sp2014-git