first commit
Merge branch 'master' of https://github.com/using923/hairsalon

Conflicts:
	.gitignore