Attempt at merge
Merge branch 'master' of https://github.com/jkravitz/AwesomePower_Thangg

Conflicts:
	www/index.html
	www/js/items.js