error handling in heroku
delete application.css
changes the application.scss
changes the application.scss
merging with heroku
add twitter handle and picture to faker
merge conflict solved