Merge branch 'master' of https://github.com/23maverick23/oaswitches

Conflicts:
	oaswitches.js