merged conflicts/
Merge branch 'master' of https://github.com/ogzd/webservices-project