Implemented crypted classes
Deleted dmmy data to be able to build the .jar
Merging assignment 3 and 4
Fixed merge conflict
After merge
After merge with master