move
Merge branch 'move'

Conflicts:
	src/fn++.hpp
Merge branch 'master' of github.com:/initcrash/funny.hpp