updating cool story bro
Merge branch 'master' of github.com:bibanon/bibanon

Conflicts:
	Bibanon/tools/BA-4chan-Archiver/src/4chan-html2json
	Bibanon/tools/BA-4chan-Archiver/the-chandler