adding some stuff to gitignore
fix merge conflicts
private content corrected
.gitignore corrected
.gitignore updated
rollback to vendor stuff
project successfully linted, grunt added