changed stuff
lasdjfsadlfjsa;ldkj
Merge branch 'master' of github.com:therocode/chromoshift

Conflicts:
	src/messages.hpp
	src/renderer.cpp
	src/renderer.hpp