server changes
Merge branch 'master' of https://github.com/DungFu/MantleRock
fixed
server and express are happy with the file hierarchy