Merge branch 'master' of https://github.com/mojombo/semver

Conflicts:
	semver.md
Merge branch 'master' of https://github.com/wendtecnologia/semver