moved app to root folder for heroku
fixing merge conflicts
remove conflicting css
moved app to root folder for heroku
remove conflicting css
moved app to root folder for heroku
heroku rework
moved app to root folder for heroku
fixing merge conflicts