ignore
Merge branch 'master' of https://github.com/dscroggins/6112TermProject

Conflicts:
	Web Application/Web.config