Create main.cpp
Merge branch 'master' into main

Conflicts:
	main.cpp
added model importing