Merge pull request #39 from stcrestrada/eddie-stephen

Eddie stephen
add additional na tiles to array for more accurate distribution, add double and triple letter scores and styles
Merge branch 'master' into clear_tiles
Merge pull request #40 from jpberry0623/clear_tiles

Add to distribution and color tiles
scoring working without testing double/triple
update git ignore
fixing merge conflicts
scoring working and updating overall and scrabble score
Merge pull request #41 from kabrewer07/word_scoring

Word scoring
Add Guest functionality
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into views

Conflicts:
	app/controllers/games_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	db/schema.rb
Revert "Add Guest functionality"

This reverts commit aec5034347f13166141a834229d5b92bed66bf68.

Conflicts:
	db/schema.rb
Add current user function for readability throughout user controller
Modify game controller
Modify users controller file

-Add current user method throughout the code
-Add condition for user in create method to allow guests to play game
Setup user model to validate empty parameters to allow guest to play

-create new_guest method that will create new user
Remove unnecessary move to method
Add new.html.erb login form
-Takes username and password
Add button Play as Guest! that'll allow for a post method to create a guest user
Re-Add routes