Power up module
Merge branch 'master' of https://github.com/klgilbert/avm

Conflicts:
	public/index.html