Lucas fixes plus slight dash styling
added button styling and gem to help heroku show gifs
Merge pull request #48 from bobolinks-2014/lucas_changes_finished

Lucas fixes plus slight dash styling
Update README.md
test
Merge pull request #49 from bobolinks-2014/test_capybara

test
Merge pull request #50 from bobolinks-2014/more_buttons

added button styling and gem to help heroku show gifs
merge conflict resolution
Merge branch 'heatmap_overlay_on_game_edit'
fixed merge