ironing out undo edit bugs
gitignored log and token_new

causing unnecessary merge conflicts