Merge branch 'master' into manager
V-0.3.1
V-0.3.2
V-0.3.2
Merge branch 'master' of github.com:LiLane/Seven-Wonders