Trying to fix merge coflict
Merge branch 'master' of github.com:flakmonkey/Talisman
commit before pull
3rd commit trying to resolve pull request
Think I fixed it this time