Weird git stuff happening on my machine
Merge branch 'master' of github.com:joelsteidl/Providence-Denver