newnewfile
Merge branch 'test5' of github.com:buren/test into new-feat
jaaa
jaja
Merge branch 'master' into new-feat

Conflicts:
	README.md
Merge branch 'master' into test5
jajaja
Merge branch 'master' into user_login
JA
new-test-m
Merge branch 'test5' into new-test-m