Added livereload to gruntfile
fixed merge