fixed merge conflicts
fix6
Finished commenting my code
Added email validation
Merge pull request #39 from Zichsah/Maria

Maria