up
Merge branch 'master' of https://github.com/HumanDesign/stonerranch

Conflicts:
	public/js/build.js