Merge remote-tracking branch 'origin/justin' into nicholas

Conflicts:
	CAPPamari.Web/bin/CAPPamari.Web.dll
	CAPPamari.Web/bin/CAPPamari.Web.pdb
	CAPPamari.v11.suo
Merge remote-tracking branch 'origin/justin' into nicholas

Conflicts:
	CAPPamari.Web/bin/CAPPamari.Web.dll
	CAPPamari.Web/bin/CAPPamari.Web.pdb
	CAPPamari.v11.suo
Merge branch 'justin' into nicholas
Merge remote-tracking branch 'origin/justin' into Laura

Conflicts:
	CAPPamari.Web/bin/CAPPamari.Web.dll
	CAPPamari.Web/bin/CAPPamari.Web.pdb
	CAPPamari.v11.suo
Added CAPP report, requirement set, and course entities
Merge branch 'justin' into Laura
Merge branch 'Laura' into nicholas
Added class boxes
Merge remote-tracking branch 'origin/nicholas' into dev

Conflicts:
	CAPPamari.Web/Content/Site.css
	CAPPamari.Web/Scripts/Main.js
	CAPPamari.Web/Views/Shared/_Layout.cshtml