Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Revert "Merge branch 'John'"

This reverts commit 93d6864d23785130d476298797b38419e0bb3f1d, reversing
changes made to 0b3ade985e8c119ef0ef86982bc7a6e4ffc0d361.
Merge branch 'John'

Conflicts:
	js/main.js
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'

Conflicts:
	js/main.js
main.js fixed removal and multiple addition issues

fixed issues w/ bot removal and multiple additions
Merge branch 'master' into John