merger
Fixed most bugs! Releasable!

git add -A
oh sorry wrote the wrong thing
2 known bugs
Bug list added