unsure about what new change is here
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02
working file decryption/encryption
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02