building, soul en money classes, inheritance
Merge remote-tracking branch 'origin/master'