without en\decrypt complete
Merge branch 'master' of https://github.com/YingXue/cse535_finalproject