Updated Changelog
Updated Changelog

Conflicts:

	CHANGELOG.md

macressler/haml,dg1dd1ngs/haml,tangposmarvin/haml,haml/haml,nazar-pc/haml,haml/haml,haml/haml,amatsuda/haml,nazar-pc/haml,dg1dd1ngs/haml,keithpitty/haml,sideci-sample/sideci-sample-haml,keithpitty/haml,macressler/haml,tangposmarvin/haml,haml/haml,stanhu/haml,stanhu/haml