Initial push
Merge branch 'master' of https://github.com/eriksalts/criterium-2014