Modded Sean a bit
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	main.cpp