10:11
Merge branch 'master' of https://github.com/Shezek/Repositorio.git

Conflicts:
	Wikout/src/com/wikout/Map.java