starting work on back-end. package json created
trying to fix merge conflict
updated package json
updated package json, working around merge conflict
fixing conflict
To add front-end files merged into development, into back-end to help in developing the server
Merge branch 'development' into back-end
added procfile
altered server.js for heroku export
correct jasmine script to work
code is still broken. ending work for the day
edited server.js
preping for heroku upload
fixing merge conflicts
fixing merge conflict
edited server.js for heroku
changed render to layout.ejs
changed layout positioning
moved script position
changed http links to https
cleaning up file structure in prep to merge to development with front-end