Changed text
Merge branch 'master' of https://github.com/bchu/blueprint-front
Fixed conflicts