Merge branch 'master' of https://github.com/rBurkart/Capstone

Conflicts:
	Capstone/App_Code/Jersey1.cs

l

Conflicts:

up

up

design

Final design