Creating Salons and comments

Salons done. Comments in process
Changes over the weekend
Merge pull request #1 from duprota/master

Pulled on March 10 4:13 PM