Merge branch 'objects_revamp' of github.com:Jeffail/manos
Merge branch 'master' of github.com:Jeffail/manos