added encryption FOR TESTING PURPOSES ONLY.  THE PASSWORD IS HARDCODED AS 'password'\!
Merge branch 'encrypted'

Conflicts:
	src/parcel.cpp

- Merged in Josh's crypto enabling to master branch, currently with
the insecure implementation
- Created routine to generate a key for the session