Normal comps
Merge branch 'master' of https://github.com/Alfwich/fall2014