updated nav bar to contain logout
working on show page
merging joes stuff
Merge branch 'master' of https://github.com/mjminc/project2
Merge branch 'feature_branch_matt'

Conflicts:
	thejar/app/views/users/show.html.erb
ajax requests working, display not quite
Merge pull request #23 from joemeers82/master

salt n push it!
revising sessions
fix merge conflict in challenges controller
fixed sessions controller
resolved conflict
done
add slightly broken handlebars template for messages
updated session controller
Merge branch 'feature_branch_matt'
ajax messages working again
nada
fixin
w
messages ajax working, new message handlebars not