use wave machine
resolve conflict
Merge branch 'first_cut' of https://github.com/gannicottb/lobbygame into first_cut