attempting fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/phantom_open_emoji_static.rb
Merge pull request #7 from Kagetsuki/master

fixed