Cats eat and die
Merge branch 'master' of github.com:windytan/fcccf

Conflicts:
	public_html/js/layer.js