clipping progress
Merge branch 'master' of github.com:liquidg3/liquidfire-curium

Conflicts:
	views/View.js