first commit soma2 edited README
Merge remote-tracking branch 'origin/master'

Conflicts:
	README

Done dealing with conflicts!