Modified generator functions to be a class
Merge branch 'master' of https://github.com/msuozzo/IFL
fixed merge conflict for generator and generator functions

Conflicts:
	generator/generator.py
	generator/generator_functions.py