adding some stuff to gitignore
bootstrap migrate from 2.3.1 to 3.0.3
fix merge conflicts
private content corrected
.gitignore corrected
.gitignore updated
rollback to vendor stuff
project successfully linted, grunt added
linting done except for angular controllers
Grunt added and tasks implemented
to merge and fix conflicts
Before linting merge finished