updated links
Merge branch 'gh-pages' of https://github.com/wkinne/bliss_salon into gh-pages

Conflicts:
	bliss_salon_framwork/index.html