testing fix
Merge branch 'master' of http://github.com/bhanderson/cpts471