img perms, misc styleguide work
favicons
fixed conflicting files (git stuff)