dsstore removal
dsstore
Merge branch 'master' of https://github.com/isopropanol/FlooringSolutionsRedesign

Conflicts:
	.DS_Store
	HTML views/index.html