Merge conflicts edited
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal