Aadd logoout link
Fixed merge errow
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable

Conflicts:
	app/views/layouts/_header.html.erb