Merge pull request #7 from hermanschaaf/improve-formatting

Improve formatting
update script that grabs edict2
Merge script conflicts
Delete old favicon