Added Login/Logout
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	db/development.sqlite3
	log/development.log
Refined Search