setting up communication with db
fix merge
Merge branch 'master' of https://github.com/RyanPhillips10/3024u
Merge branch 'master' of https://github.com/RyanPhillips10/3024u
added communication from front end to database
merged conflicts