Merge pull request #4 from doublelift/master

Yeoman Scaffolding
refactor
refactored
Merge pull request #5 from Pouncealot/master

(refac)Refactoring