Convert to Unix line endings
Merge remote-tracking branch 'refs/remotes/upstream/master'
Add Skoopee class
Change timestamp format
Merge remote-tracking branch 'refs/remotes/upstream/master'