true up
Merge branch 'master' of github.com:czarcasm/tickmark

Conflicts:
	public/assets/application-539227784bbe172a20af1781bd7a828d.js.gz
	public/assets/application-f308648b5d2f737e5d4c3597f9199f1d.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz