init commit of everything done to this point
Merge pull request #1 from michaeldjeffrey/develop

init commit of everything done to this point