moo
Merge branch 'master' of https://github.com/glomotion/angular-boilerplate

Conflicts:
	angular-boilerplate.sublime-workspace