flux working (possible workaround?)
ignore updated once more
Merge branch 'flux-requirement'

Conflicts:
	src/tealsim/gamification/Task.java

fixed Flux, Requirement setup