Updated license.
Merge branch 'master' of https://github.com/guy-murphy/Conclave