added .gitignore
changes to db
added bootstrap
Merge branch 'master' into views