Naga Varun super old version ...
Merge branch 'master' of https://github.com/ShaastraWebops/google_lunar_challenge

Conflicts:
	authmn/forms.py
	authmn/forms.pyc
	authmn/models.py
	authmn/models.pyc
	authmn/urls.pyc
	authmn/views.py
	authmn/views.pyc
	lunar/global_settings.py
	lunar/settings.py
	lunar/settings.pyc
	lunar/urls.py
	lunar/urls.pyc
	static/css/moon.css~
	static/img/glc_old.png
	static/img/google_lunar_challenge_icon_old.png
	templates/authmn/index.html
	templates/authmn/login.html
	templates/authmn/register.html