Added my name
something
new line again
Merge branch 'login_form' of https://github.com/bridgpal/sample into bridgpal-login_form

Conflicts:
	newfile