Merge branch 'master' of https://github.com/sbabitsky/Burndown

Conflicts:
	Burndown/Web.config