updated database backup before editing constraints on server
Merge branch 'master' of https://github.com/Gregs-List/Chronos

Conflicts:
	GL_dump.sql
made backup of database