Generalized functions and tween groups
Update
Merge branch 'master' of https://github.com/TehPwns/flux

Conflicts:
	src/flux.cpp