Fix merge conflict
Add images
Update to grunt 0.4