:D
Merge branch 'master' of https://github.com/ChipaKraken/ck12

Conflicts:
	style.css