Fix bug
Merge branch 'master' of github.com:OHIOhackathon2014/Project_Zen