launching to heroku config.serve_static_assets = false
modified environment/production.rb

config.serve_state_assets = true
config.assets.compile = true
modified environment/development.rb

commented out config.serve_static_assets = false
 changed html canvas width to fix gameplay
fix merge conflict
add levels box to game page
change margins to account for levels box
Add feature to increase levels

speed and level increase after every ten lines of completed tetris

we hope this will incentivize boggle/scrabble play (which will give greater points without increasing speed)
Merge pull request #16 from alanflorendo/multi_level

Speed and level increase after completing every ten tetris lines
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable
reset level and speed when game over and restart
update lines needed to advance back to 10
update git ignore db
Merge pull request #17 from kabrewer07/levels

reset level and speed when game over and restart
Add a file and create function to load Scrabble Dictionary

-Create texts folder to add scrabble dictionary txt file for parsing
-Create function loadDictionary to parse the words in the txt file and place them in an array
write loop to add color, text, and number to blocks

-strictly visual, need object to pass variables to landed block
refactor draw block function to drawtile, drawletter, and draw number functions.
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable
Merge branch 'master' into filling_tiles_with_letters
Merge pull request #18 from jpberry0623/filling_tiles_with_letters

Filling tiles with letters
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Tetroggleable into eddie

Conflicts:
	app/assets/javascripts/game.js
	tetroggleable/log/development.log
	tetroggleable/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tetroggleable/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tetroggleable/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tetroggleable/tmp/cache/assets/development/sprockets/398fadf880b4655205b456dbd7170cb5
	tetroggleable/tmp/cache/assets/development/sprockets/39c5f08a3fa56fa715c0edef77579c3f
	tetroggleable/tmp/cache/assets/development/sprockets/7281c4305a0beba622ad1a38f6441f3b
	tetroggleable/tmp/cache/assets/development/sprockets/94e4cc7aba07f725164dd40beede881d
	tetroggleable/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tetroggleable/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tetroggleable/tmp/cache/assets/development/sprockets/e9b7526c04436985a2d42a6353cbaeb5
	tetroggleable/tmp/cache/assets/development/sprockets/f43e83986b312e98b346c8f26a5012f6
	tetroggleable/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655