json issues
Merge branch 'master' of https://github.com/unbxd/Email-Generator

Conflicts:
	rapportiveConfig.txt
	rapportiveEmail.py
json issues