update .gitignore
Merge branch 'master' of github.com:jeffthestampede/cssdash
modify gitignore
Merge branch 'heroku' of github.com:jeffthestampede/cssdash into heroku
gemfile.lock