Added elementary icon to emoji
Merge pull request #199 from Ant59/master

Added elementary icon to emoji
Infinite Scrolling

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
softTask optimizations.

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
Changelog
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Merge branch 'v3'

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/Miscellaneous/Emoji.coffee