refactors, add gruntfile
Merge branch 'master' of github.com:marijnkoolen/housemouse

Conflicts:
	public/elements/umbrella-element.html