dummy v2 is now dummy, dummy is thus olddummy
Merge branch 'master' of github.com:Dannyzen/Python-Fun

Conflicts:
	dummy_email_generator/dummy_v2.py