Pushing pretty much final version.
Merge branch 'master' of https://github.com/caneroj1/Tumblr_image

Conflicts:
	game.rb
Merge branch 'master' of https://github.com/caneroj1/Tumblr_image