pequeño cambio en AST y agregado Cross
Merge branch 'master' of https://github.com/christhianjesus/Trinity

Conflicts:
	Context.rb