Added print function in state that displays current map and boxes
Merge branch 'master' of github.com:amelim/RIP-2013

Conflicts:
	cpp/state.cpp
fixed merge conflict