barebones template from darribas.org
Fixing conflict
Merge pull request #1 from darribas/master

barebones template from darribas.org
Adding funding, news and upcoming events pages
Ready to push with this
Merge pull request #2 from darribas/master

Adding news, funding and upcoming events pages
funding and news