Added authentication, still working on authorization
Merge branch 'master' into luis

Conflicts:
	out_and_about_app/app/views/application/index.html.erb
	out_and_about_app/db/schema.rb
Merge pull request #6 from gristleism/luis

Added authentication, still working on authorization