* adding some documentation
 * making the username/password/db configurable as seperate attributes
updating some documentation
fixing merge

Merge branch 'master' of https://github.com/mekongGOOD/odc-hrok-api

Conflicts:
	README.md