made some changes....(somewhere)
Merge branch 'master' of https://github.com/OHIOhackathon2014/ComicIM-2.0