modifed gitignore
Merge branch 'master' of https://github.com/fmackojc/MemeOverflow
Merge branch 'master' of heroku.com:memeoverflow into herokupull