bug fixes
Merge branch 'master' of https://github.com/haidongt/tripplanner
added registration
added registration
changed settings.py
added print username
removed hidden
added token
added import csrf
added data