test one more
Merge github.com:Bizlogisticx/bizlogisticx

Conflicts:
	app/views/users/account.html.erb

test to how to work with pull command
Merge github.com:Bizlogisticx/bizlogisticx

Conflicts:
	app/views/users/account.html.erb

test to see how pull works