latest from mmcgary1 branch
Merge branch 'master' of github.com:hughes88/clueless2014