Spruced up index.html with some CSS
Added public/stylesheets/ folder
troubleshooting merge conflicts
updated app.scss