added upcoming features
Merge branch 'master' of github.com:maxharlow/fantasy-parliament