git ignore .DS_Store
Merge branch 'gh-pages' of https://github.com/sfbrigade/FusionTable-Map-MobileTemplate into gh-pages

Conflicts:
	.gitignore