idk man
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	main.cpp
Fixed detection radius of state change for Sean. He was moving too quickly and skipping over the detection range.