Updated docs
Update to get git to stop complaining
Merge branch 'feature/docs' into develop