Trying to add email
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ask-Harvard/simple-todos.js
Merge branch 'master' of https://github.com/maxshen1996/FinalProject

Conflicts:
	Ask-Harvard/simple-todos.js