Update Readme

Add authors/contribution guidelines, reorder to make setup more obvious
Fix conflict

Conflicts:
	README.md