ok
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/main.cpp