Working database
Merge branch 'master' of https://github.com/mapto/sprks
Updated database upload
Merge remote-tracking branch 'remotes/origin/master' into simulation

Conflicts:
	dummy_class.py