Added basic object class
Merge branch 'master' of github.com:We-Have-Names-Actually/WSW
Merge branch 'master' of github.com:We-Have-Names-Actually/WSW
Fixed conflicts