Add livereload
fixed merge