initial setup for bower and grunt
Merge remote-tracking branch 'origin/master'
initial setup for bower and grunt