setup
Merge branch 'master' of http://github.com/jburdin7/CSC180