Added encryption and decryption of messages
Started working on friendlist
Added cryptoim2 friend, fixed message joining with spaces
Resolved merge conflicts