ruby 1.9.3
Merge branch 'master' of github.com:Hide777/sample_app

Conflicts:
	Gemfile