solved
Merge branch 'master' of git@github.com:sdjksdafji/FuckingBirdman.git

Conflicts:
	src/main/java/cs5412/project/distributed_file_system/pojo/History.java