Fixes #51
Resolve Merge Conflict
Merge branch 'master' of github.com:Sector67/nsa-away

Conflicts:
	src/org/sector67/nsaaway/DisplayCiphertextActivity.java