Also put our username into ciphertext.
Merge branch 'master' of github.com:Traxmaxx/5A002

Conflicts:
	client/scripts/controllers/main.js
Put back my stuff, no was it's going away
Merge branch 'master' of github.com:Traxmaxx/5A002