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
Setup rails skeleton for rspec testing

-Add rspec controllers/factories/features/helpers/models folders
-Add rails_helper.rb and spec_helper.rb files
-Include rspec-rails in gemfile
Ajax request sent to game_new route
-renders game objects in game_show route
Add saveGame() function
-need to add this for ajax functionality
-return saveGame() in last else conditional statement in updateGame()
game no longer removes extra tiles if coordinate in clearTiles array more than once
Add @games = Game.all in index action for game controller
Create user profile
User profile displays games
Remove method from game model
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
first sort function for sorting array before clearing tiles
Add helper method game_stats
-render score partial in method
Add _score partial to game view
remove p params in game controller
further sorting testing
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into clear_tiles
Merge pull request #56 from kabrewer07/clear_tiles

Clear tiles
Merge pull request #55 from stcrestrada/stephen

Stephen
add all user game scores to game index
add helper method