Yeoman scaffolding
merging branches
fixed .gitconfig
merging to master
merging branches
merging branches
merging branches
merging