with bombsies
merged... maybe
added gitignore