Merge pull request #1 from VanGrack/jesse_working_branch

Adding in objects
Merge remote-tracking branch 'origin/master' into jesse_working_branch