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 pull request #18 from darribas/master

Adding small grid to home page and gallery page
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
update news
funding
Merge pull request #20 from sjsrey/master

updating news
Merge branch 'master' of github.com:sjsrey/pysal.github.io

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

Conflicts:
	_includes/index.md
	_includes/news.md
	_includes/upcoming_events.md
	_site/news.html
	_site/upcoming_events.html
Merge pull request #21 from sjsrey/master

updating news
removing figs at bottom of page.
updating footers
Merge pull request #23 from sjsrey/master

Fixing image problem
Adding _site to .gitignore
Moving images from the grid to separate folder for general cleanup
Adding markdown option to grid page