commit of new files
made a change
made other changes
hot fix time
More changes!
Woot
Merge branch 'testing'

Conflicts:
	test.rb
Merge branch 'master' of https://github.com/mkorthuis/Test

Conflicts:
	test.rb