mid testing work
user model merge issues
lumber_mill testing progress
Merge branch 'ThreeJS' of https://github.com/tufts-LPC/Trails-Forward-server into ThreeJS