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
code is still broken. ending work for the day
cleaning up file structure in prep to merge to development with front-end
trying to merge branches into dev