testing
ENH exploring images for landing page
conflict resolution
Merge branch 'master' of https://github.com/pysal/pysal.github.io

Conflicts:
	_includes/index.md
Merge branch 'master' of https://github.com/pysal/pysal.github.io

Conflicts:
	_site/index.html
cleanup
Merge pull request #19 from sjsrey/master

Cleaning up