Please, commit!!
Merge branch 'master' of https://github.com/duprota/Salon_vs6 into duprota-master

Conflicts:
	db/schema.rb
Merge pull request #2 from vijay-manickavasagam/duprota-master

Duprota master