I made some things
Merge branch 'master' of https://github.com/emilysa/SummerProject

Conflicts:
	generator.py