tar ner senaste versionen bara....
fixade merge problem
Conflicts:
	src/main.cpp