changed js in sign-up and sign-in
Merge branch 'tiago'
no message
no message
Merge branch 'master' of https://github.com/lewiemortier/familyMinute

Conflicts:
	css/sign-in.css
Merge branch 'tiago'