modified readme
cool on conflicts

Merge branch 'develop' of github.com:markmattinglySIQ/first-repository into develop

Conflicts:
	README.md