Merge remote-tracking branch 'nazuki/master'
Merge remote-tracking branch 'upstream/master'
deleted errant emoji
Merge remote-tracking branch 'upstream/master'
re-added milky_way
Merge pull request #27 from Kagetsuki/master

re-added milky_way