general to core
Merge branch 'master' of https://github.com/blacksburg98/dyplot

Conflicts:
	dyplot/c3/core.py
	examples/tutorial5.py