initial commit
yeoman init
fixed grunt file
Merge remote-tracking branch 'origin/master'