merging again
heroku troubleshooting
Merge branch 'master' of https://github.com/MeddTube/MeddTube into david
deleted css
Merge pull request #20 from MeddTube/david

David