bootstrap
Merge branch 'master' of github.com:xseignard/letters

Conflicts:
	component.json