added email condition; tbd:edit page
added edit profile page
rm unwanted files
changed some stuff
Merge branch 'master' into georgiana

y
fixed jinja bug
testing edit profile
merged with master