Degayfying bower.json and correcting .gitignore
Merge conflicts in .gitignore solved