fixed buzzlogo
fixed .gitignore
merged Eric's changes with mine
fixed .gitignore again