build/docs
Merge?
Build
Merge branch 'master' of https://github.com/dotJEM/angular-routing

Conflicts:
	build/angular-routing.js
	build/angular-routing.min.js
	build/src/state.js
	build/src/stateTransition.js