error msg
Merge remote-tracking branch 'origin/master'

# By Aetherpoint
# Via Aetherpoint
* origin/master:
  Adds favicon... idk where to put this...