frist commit for salon manager
Merge branch 'master' of https://github.com/kimchen/SalonManager