Local repo commit!
Merge branch 'master' of https://code.google.com/p/r284e555-cs680-sp2014-git