import grunt-contrib-connect for easier front-end development
Merge remote-tracking branch 'origin/master'