added ds store to gitignore
Merge branch 'bootstrap'
added favicon for no reason
Merge branch 'master' of github.com:willhall88/Angry-Kitty into bootstrap