I fixed it
drop coconuts
Merge branch 'team_mcawesomer' of https://github.com/bobandraa/Coconect-Four into team_mcawesomer

Conflicts:
	js/controller.js
	js/view.js
Merge branch 'drop_anim' of https://github.com/bobandraa/Coconect-Four into team_mcawesomer
re-add drop
Merge branch 'drop_anim' of https://github.com/bobandraa/Coconect-Four into team_mcawesomer