Commiting because I don't have a choice
Fixing conflicts
Adding Interlocking CU logo favicon