modulo
Merge branch 'module-pattern'

Conflicts:
	badabing.js