more setup
Merge branch 'master' of https://github.com/rkstedman/healthhack into yin

Conflicts:
	package.json
-updated gitignore and grunt copy file