reordering front end files
 On branch master
removed heroku db setting
merge fix