updating files
Merge branch 'master' of https://github.com/pmannion/salon

Conflicts:
	Salon1.v12.suo
Merge branch 'master' of https://github.com/pmannion/salon.git