First commit !
created basic models for resources and traits
prepping for github
resolving conflicts