adding my email
Merge branch 'master' of git://github.com/NiteWolf/scm into NiteWolf-master

Conflicts:
	README.md