pulled to mac
Merge branch 'gh-pages' of https://github.com/Croge32/newaffordable into gh-pages

Conflicts:
	.DS_Store
	about.html
	brands.html
	estimates.html
	repair.html

merging
prepare for SPA