fix flickering
Merge branch 'master' of github.com:GoogleDH/Contra
collision improvements, WIP
Merge branch 'master' of github.com:GoogleDH/Contra