Replaced favicon
Removed commented code
Removed conflicts in develop.css