styles added
conflicts fixed
Merge branch 'master' of https://github.com/Brodiemc/HacakathonMongo