Almost done !
Merge branch 'master' of https://github.com/johalnes/INF3331

Conflicts:
	my_generate_file_tree.py