Fixing stuff
Merge branch 'master' of https://github.com/jrgleason/Spring4Hackathon