updated nav bar to contain logout
working on show page
s3 working
s3 working
Merge pull request #21 from rasbabbo/master

adding login and sessions
please
Merge pull request #22 from joemeers82/master

rocknroll
Merge branch 'feature_branch_matt'

Conflicts:
	thejar/app/views/users/show.html.erb
images showing
push it
Merge pull request #23 from joemeers82/master

salt n push it!
fixed sessions controller
resolved conflict
done