Fixed accidental push of doxy_config.
Merge branch 'master' of https://github.com/PStanos/sparks2

Conflicts:
	doxy_config