ABORT
Merge branch 'master' of ssh://github.com/Tirmenat/solara

Conflicts:
	main.cpp
Merge branch 'master' of ssh://github.com/Tirmenat/solara

Conflicts:
	Stage.cpp
	main.cpp
Merge branch 'master' of ssh://github.com/Tirmenat/solara

Conflicts:
	main.cpp