Added conditional functonality.
Merge branch 'master' of https://github.com/thomasmichaelwallace/calcpad

Conflicts:
	public/js/DepTree.js
	public/js/LineCollection.js
	public/js/lines/condition/condition.js
	public/js/lines/formula/formula.js