updated nav bar to contain logout
working on show page
Merge branch 'feature_branch_matt'

Conflicts:
	thejar/app/views/users/show.html.erb
fixed sessions controller
resolved conflict
done
updated session controller
Merge branch 'feature_branch_matt'
nada
fixin
w
fix merge
Merge branch 'feature_branch_matt'

hope this workss
fixed login bug, added functionality to nav-bar
fixed login redirect and installed update user
updated edit functionality
Merge branch 'master' of https://github.com/mjminc/project2

pulling it all together
fixed merge conflict
Merge pull request #28 from rasbabbo/master

added nav bar functionality, and updates,