updates to css
Merge branch 'gh-pages' of https://github.com/kimberlydenham/salonsite into gh-pages

Conflicts:
	index.html