Updated grunt with livereload
Updated app
Resolving conflict