cuby class
Merge branch 'master' of github.com:LostCodeStudios/gnoPortal

Conflicts:
	dist/assets/scripts.js