add and delete 1
add file 1
add 2
add 3
Merge branch 'branchtest2' of https://github.com/gamepatriot/cpp-DungeonGenerator into branchtest2

Conflicts:
	test.cpp