working app
Merge branch 'next_lesson' of github.com:hedgesky/progex_ruby into next_lesson

Conflicts:
	app_2048/.gitignore