changes
changesMerge branch 'master' of https://github.com/valtas1988/POMDP

Conflicts:
	pomcp-1.0/src/boxpushing.cpp
	pomcp-1.0/src/boxpushing.cpp~
	pomcp-1.0/src/pomcp