Dennis is hilarious
Merge branch 'develop' of https://github.com/CS180Fall2014/UcrRunner into develop