renamed:    app.rb -> my_app.rb
	new file:   test.rb
Merge branch 'master' of github.com:mcmegavolt/sinatra_test_app