Here you go
Merge branch 'master' of ssh://github.com/Tirmenat/solara
For Neal
Merge branch 'master' of ssh://github.com/Tirmenat/solara

Conflicts:
	main.cpp