added email funciton
Merge branch 'master' of https://github.com/whoedward/Riddler

Conflicts:
	index.html
	js/script.js
Merge branch 'master' of https://github.com/whoedward/Riddler
Merge branch 'master' of https://github.com/whoedward/Riddler
updated email branch
Merge branch 'master' of https://github.com/whoedward/Riddler
finished email notificaiton system
merged email notification system