emailcode 2
Merge branch 'master' of https://github.com/kunals1994/mentor-stack

Conflicts:
	emailcode.html
emailcode 2