fixed my bad saved a merge conflict
Merge branch 'master' of https://github.com/robocarp/beatavengers

Conflicts:
	Main.js