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

Conflicts:
	images/bullet.png
	images/neal.png
	images/nealflipped.png
	images/solaratitle.png
	images/terrain.png
	main.cpp
Merge branch 'master' of ssh://github.com/Tirmenat/solara

Conflicts:
	main.cpp