commit because of conflicts
Merge branch 'master' of https://github.com/djuta/notre-dame

Conflicts:
	Admin/WaitTimeAdmin.aspx.cs
	App_Code/waitClass.cs