Build: 73 Branch: master
 1.11.3 SHA: e27c612
Merge branch 'gh-pages' of github.com:Solid-Interactive/masseuse into gh-pages

Conflicts:
	.build
	docs/BaseView.html
	docs/ComputedProperty.html
	docs/MasseuseModel.html
	docs/MasseuseRouter.html
	docs/ObserverProperty.html
	docs/ProxyProperty.html
	docs/RivetsView.html
	docs/ViewContext.html
	docs/baseView.js.html
	docs/channels.html
	docs/channels.js.html
	docs/computedProperty.js.html
	docs/createOptions.html
	docs/createOptions.js.html
	docs/index.html
	docs/main.js.html
	docs/masseuse.html
	docs/masseuseModel.js.html
	docs/masseuseRouter.js.html
	docs/namespaces.list.html
	docs/observerProperty.js.html
	docs/proxyProperty.js.html
	docs/view.js.html
	docs/viewContext.js.html