ahahhaha
Rest of the magiccc

Conflicts:

	assets/js/mastessets.js
	views/home/index.ejs
Update layout.ejs

That didn't belong there.
Merge branch 'order-by-involvement'

Conflicts:
	assets/js/mastessets.js