resolving conflicts
Merge branch '4.1' of https://github.com/psampaz/docs into 4.1