Committing changes before merge
Merge branch 'master' of github.com:palistov/barbershop

Conflicts:
	src/barbershop.c