first commit
fix conflicts from git vs. yeoman