Added grunt server task
Merge branch 'develop'
Added npm install step to README.md
Merge branch 'develop'