commented out duplicate insertion of demo birdwatcher user
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin

Conflicts:
	scheme_setup.sql