lab work
Merge branch 'master' of https://github.com/HumbleAlchemy/kryptex_app

Conflicts:
	socket/socket_methods.js