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
Setting up markdown for index page
md files
Merge pull request #3 from darribas/master

Setting up markdown for index page
Merge pull request #4 from sjsrey/master

populating md files
List of upcoming events and fixes to news
Merge pull request #5 from darribas/master

List of upcoming events and fixes to news
wiped dani's info