build start
updated snap
wow, amazing build process
Merging in build

Conflicts:
	Gruntfile.js
fixing bad merge of gruntfile