changed readme
Merge branch 'master' of https://github.com/szarmes/dbProject

Conflicts:
	README.md