Generation of random files saving to file
Merge branch 'BC_devel'

Conflicts:
	src/main.cpp