readme update
Merge branch 'master' of https://github.com/Erno3000/WEBDB

Conflicts:
	README.md