ignore map.txt
sfui to project
main
Merge branch 'Sebastian'

Conflicts:
	grief/grief/main.cpp