Changed where login/logout is
Merge branch 'master' of github.com:m00dawg/Aquaricle

Conflicts:
	app/views/layout.blade.php