init
Merge branch 'master' of https://github.com/peterpersiel/stream

Conflicts:
	Gruntfile.js
	README.md
	package.json
	public/css/style.css
	public/js/app.js