Desde Eclipse
Merge branch 'master' of https://github.com/lukegaby/Dise-o2014

Conflicts:
	holaMundo/src/holaMundo/Hello.xtend

Se agregan impresiones de lineas