mentioning bourbon libary in README.md
installed node-bourbon as a dev dependency
install node-sass as a dev dependency to try to solve not recognizing bourbon, added reset
added dist/main.css to .gitignore
add includePaths for bourbon, which fixed grunt not finding bourbon
Merge branch 'master' into sass-bourbon

Conflicts:
	dist/client.js
	dist/templates/water-all.html