formatted and fixed imports
Merge branch 'master' of https://github.com/HackforSC/2014H4SC-Gripe