Merge pull request #15 from freenode/compile-css-hack

author Ed Kellett <redacted>

Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)

committer Ed Kellett <redacted>

Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)
author Ed Kellett <redacted>
Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)
committer Ed Kellett <redacted>
Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)
diff --cc .travis.yml
Simple merge
diff --cc deploy.sh
Simple merge
author	Ed Kellett <redacted>
	Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)
committer	Ed Kellett <redacted>
	Tue, 23 Feb 2016 23:52:43 +0000 (23:52 +0000)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history