cleaned up some of the routes
merged models.js
Merge branch 'master' of https://github.com/hankland/cs169
worked on battle system. still buggy
Merge with portal update
Merge branch 'master' of https://github.com/hankland/cs169
Added experience/death features to battle, tidied up overworld. Need to add tests, code coverage, and maybe extra features