task 1 2
Merge branch 'master' of github.com:agilejs/bacon

Conflicts:
	client/js/app.js
	client/js/controller.js
	client/partial/index.html
Merge branch 'master' of github.com:agilejs/bacon