Readme update 1

Added software license
Merge branch 'master' of https://github.com/WhalesAreDelicious/Conquest

Conflicts:
	README.md