clickheat
remove
Merge branch 'master' of github.com:jimmyn/qed

Conflicts:
	sass/screen.scss
Merge branch 'master' of github.com:jimmyn/qed

Conflicts:
	.gitignore
	sass/screen.scss
Merge branch 'master' of github.com:jimmyn/qed

Conflicts:
	sass/screen.scss
Merge branch 'master' of github.com:jimmyn/qed

Conflicts:
	sass/screen.scss
Merge branch 'master' of github.com:jimmyn/qed
Merge branch 'master' of github.com:jimmyn/qed