fix
Merge branch 'master' of https://github.com/jamieturner/accufly
741ed8fc437b7a1b702148ce9a5ae3af14.

Conflicts:
	public/assets/application-141f1a941a8e696b0b2af4e99775b6ce.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/manifest.yml