Adding Gemfile.lock to git ignore so that travis won't add the --deployment flag
adding travis build status
trying to get travis to work.
oops wrong group
adding rspec as default rake task
the code doesn't support ruby 1.9.3
Merge branch 'master' into rack_test_upload_file

Conflicts:
	.travis.yml
	Gemfile.lock