Commit at home
Merge branch 'master' of https://github.com/rafamalaga86/cc

Conflicts:
	public/css/clickstyle.css