Trying everything together
testbed v1
Fixed rebase??
Merge fixed?
too many merges
Compilation errors after merging fixed
Working shortest path algorithm, not optimal
It's working!!!!!!!
Cleaner code and some comments
Merge branch 'adrianDevBranch'

Conflicts:
	main.cpp
	makefile
Merge branch 'master' of https://github.com/IMT3591/AI_assigment2

Conflicts:
	main.cpp