testing stuff
Merge branch 'develop' into testing_testing
added documentation, fixed factory, tests passing woo