more stuff done
Merge branch 'master' of https://github.com/mjmayank/emailviz

Conflicts:
	.gitignore