Merge branch 'Basic'

Conflicts:
	app.rb