login screen work
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into dev
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into dev
some changes
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into dev
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into dev
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into dev
first commit for dev branch
fixed merge
changes to dataController and friends
small changes to controllers
switching to master to pull Nicks stuff
switching to master
post merge
getting png
Merge branch 'impact' into dev
changed to proper map get funciton