Initial commit

Took me forever... doesn't even do anything. Here we go! :smile:
Merge remote-tracking branch 'origin/master'