Fixed

removed head error
Fixing merge conflicts and preventing idea files from being committed
Merge branch 'master' of https://github.com/darthmars97/CodeCamp2014