bower
Merge pull request #8 from freddiefujiwara/develop

bower