first commit

test
add first version of map
Merge https://github.com/zergx1/mario

Conflicts:
	main.cpp