m com 2
master c 3
branch 1 commit 1
branch 1 commit 2
Merge branch 'branch1' of https://github.com/grynienp/paweltest into branch1

Conflicts:
	Test/Test/Controllers/AccountController.cs