change email address
Merge branch 'master' of github.com:jimmydief/jimmydief

Signed-off-by: James Diefenderfer <jdiefenderfer@salesforce.com>

Conflicts:
	index.html