COSAS CHACHIS
Merge branch 'master' of github.com:Dirbaio/GottaCodeFast

Conflicts:
	Editor.cpp