gitignore
makefile
gerger
Merge branch 'master' of https://github.com/Jayis/PDP_final

Conflicts:
	simulation/Makefile
	simulation/main.cpp
	simulation/main.out
test gogit add -A :/git add -A :/