new phone key
Merge branch 'master' of github.com:akerl/keys

Conflicts:
	default/jane
one more time