comit hocol
Merge branch 'master' of https://github.com/fulanitto/cnc_hocol2013

Conflicts:
	.gitignore