Updating backend merge code
iasdfsdfoii
Merge branch 'master' of https://github.com/sli7246/Team2048
mergining now
pushing latest version of backend up
Fixing merge issues