Gemfile bundl
git pull upstream master

Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Refactor games controller
-remove @user = current_user
- pass current_user to @game params
- remove @user from Game.where()
add current_user method in application controller
make accessible to all controllers and views
- helper_method :current_user
Create games_controller_spec file
- create a game and user in rspec test
	- pass
- describe index in rspec
--pass
Describe show route
- assigns game to a current_user
add box that tracks guessed words and the score
Removed high score method from rspec, going to place game model
Describe get #new, create a new instance of a game
Create rspec test for ajax request in post create route
Add games.rb in factories folder
cleaning up js a bit
change nav styling to match arcade design, add transitioning effect, fix container width
change word append to prepend
fixed scoring so it does not do word multipliers on all words put together
remove new game link from home page, add image and link to new game
remove console logs and integrate double score for words longer than 7 letters
Pull upstream master

Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Merge pull request #75 from kabrewer07/word_score

add box that tracks guessed words and the score
Merge pull request #76 from kabrewer07/scoring

Scoring updated to calculate correctly
Pull upstream master after kims merge

Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into stephen
Create rspec file in model spec folder for games
create game
return score of 10
rspec success