added login system
Merge branch 'master' of https://github.com/haidongt/tripplanner

Conflicts:
	tripDB/views.py