.
Merge branch 'master' of https://github.com/jorgeColl/tecDisenio2014.git

Conflicts:
	src/main/java/ar/fiuba/tecnicas/output/IOutput.java