added json->db easter egg mechanic
Merge branch 'master' of https://github.com/burkean/gracefulcharity

Conflicts:
	bin/gracefulcharity