Hai Rio
Merge branch 'master' of https://github.com/riverninj4/cs255-AES

Resolving some questionable merge conflicts.

Conflicts:
	cs255-debray-lavigne.user.js
Merge branch 'master' of https://github.com/riverninj4/cs255-AES