update package.json + show splash screen
merge a conflict
live reloading (client & server) with grunt-nodemon