Completed Challenge 18
Merge branch 'master' of https://github.com/mattsbmws/CSCI-21-SPRING-2014