Changelog update~ includes a fixed version of faux's changelog
Merge branch 'bleeding-edge-freeze' of https://github.com/NerdyBoy1104/Baystation12 into bleeding-edge-freeze

Conflicts:
	html/changelog.html
Changelog update~ includes a small typo fix to faux's recent update too.