Change README
Update README
adding a new file
updating readme
Delete test.rb
Adding hej file
Merge branch 'testing'
Changing README
changing README to test merging
Merge branch 'test'
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt