try to solve merge conflict
Merge branch 'master' of https://github.com/whoedward/Riddler

Conflicts:
	css/style.css
	index.html
	js/script.js
Merge branch 'master' of https://github.com/whoedward/Riddler
merge conflict
merge conflict
Merge branch 'master' of https://github.com/whoedward/Riddler
pull the lastest code from master
Merge branch 'master' of https://github.com/whoedward/Riddler
able to send email to challenger
merge conflict