First commit
Merge remote-tracking branch 'origin/master'

Some crazy things are happening