nothing

nothing
bugged merge
Merge branch 'jonathan-branch

Conflicts:
	routes/users.js
merge

success
started schema
minor change
mc
mc
schema
user change
order commit
form validation
conflicts
conflicts (again)
conflicts
verify email with ajax
Merge branch 'francois-branch'
mongoos scheama
master merge
quick fix