Version as of Fall 2013
Merge branch 'master' of https://github.com/pranjalv123/vigilance