Update README.md
Merge branch 'develop' of https://github.com/SmashedRockSoftware/ProjectSardina

Conflicts:
	README.md
Update README.md
Trying to fix stuff
Merge branch 'develop' of https://github.com/SmashedRockSoftware/ProjectSardina into develop