Clean functions and add new one
Merge branch 'crazyTest'

Conflicts:
	Main.cpp