added charity
charity
build
description and auction state
Merge branch 'master' of https://github.com/scott113341/appicenter

Conflicts:
	app/build/style.css
	app/build/templates/scoreboard-controller.html
build