Win/lose messages done
Merge branch 'master' into win_condition