First commit
tweak in README.md
tweak in README.md
Merge branch 'master' of https://github.com/srebolledo/locomotive-boilerplate

Conflicts:
	README.md