changed gitignore one last time
no clue what I'm merging

Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web
bug

Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web
stuff

Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web
"no clue"

Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web
added  db/development.sqlite3 to gitignore