gitignore
Merge branch 'master' of https://github.com/sudorails/e_verification

Conflicts:
	.gitignore
modi
Merge branch 'master' of https://github.com/sudorails/e_verification
Merge branch 'master' of https://github.com/sudorails/e_verification
Merge branch 'master' of https://github.com/sudorails/e_verification
merged
server changes
Merge branch 'master' of https://github.com/sudorails/e_verification