ahahhaha
Rest of the magiccc

Conflicts:

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