Provoking an error by changing the first line.
Merge branch 'master' of https://github.com/slomascolo/NCEAS-RENCI_2014
Adding some needed flair.