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

barebones template from darribas.org