Initial commit with fancy stuff like packages and junk
Merge remote-tracking branch 'origin/master'