add placeholder favicons
add livereload and modernizr to grunt script
remove duplicate images
fix merge conflicts