Initial commit
Added parts of the Prototype 2
Merge https://github.com/bardbachmann/MastersPrototype2