Init
Merge branch 'master' of http://github.com/emrickgarrett/cse322Project