Push
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/js/magic-calculations.js
	public/assets/js/result-display.js