Login ready for data
Merge branch 'master' into Santrece-login
"askld;fj"
Conflicts:
	source/app/controllers/index.rb
login
Merge branch 'master' into Santrece-login
"merge this shit...."
Merge pull request #6 from 4justinstewart/Santrece-login

Santrece login