My first commit
Added email, etc.
Fix merge conflict