no message
Merge branch 'master' of https://github.com/hirro/yo-worktajm

Conflicts:
	bower.json