add content_tag into layouts/application.html.erb
-display error in login if user validation is incorrect

Add logic in create action in game controller.
-if user login information is incorrect display error
Add scrabble score to user profile view
Merging with upstream master
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Merge pull request #51 from kabrewer07/styling

Styling
Merge stephen branch

Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable

Conflicts:
	app/views/layouts/application.html.erb
add user lines score in user show view:
Merge with upstream master

Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Add profile link to header partial
Merge pull request #53 from stcrestrada/stephen

Stephen
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
remove content in show view for game
Merge with upstream
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Merge pull request #54 from stcrestrada/stephen

Stephen
removed branch 'stcrestrada-stephen
further sorting testing
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into clear_tiles