updated
Merge branch 'master' of github.com:therocode/featherkit-showcase

Conflicts:
	ants/src/renderer.h
	rain/src/main.cpp
Merge branch 'master' of github.com:therocode/featherkit-showcase
removed stuff