first push
Merge branch 'gh-pages'

Conflicts:
	index.html
	resources/components/about.html
	resources/components/chiropractic.html
	resources/components/header.html
	resources/components/massage.html
	resources/components/myofascial.html
	resources/css/main.css
	resources/js/header.js
	resources/js/main.js
cursor change