Revert 59efdf2..cc93426

This rolls back to commit 59efdf237978b8505d5182eb9e1d2ea4c3240bc9.
Merge branch 'master' of https://github.com/sczy/first_demo

Conflicts:
	1.rb