signup
nothing
Merge branch 'master' of https://github.com/aadisriram/Smart-Nomad

Conflicts:
	war/Signup.html
	war/SmartNomad.css
	war/SmartNomad.html