First commit
Merge branch 'master' of https://github.com/smeredith0506/testbot

Conflicts:
	lib/shared/adapters/rspec2_adapter.rb