gitignore update
Merge branch 'master' of https://github.com/LorenGr/angular-flatstrap