Mine!

,
Merge remote-tracking branch 'origin/Daniel's-branch' into test_check

Conflicts:
	views/signup.html