Agrego mas elementos a la memoria inicial y toco algunas cosas del test que no se usaban
Merge branch 'master' of https://github.com/LucasLencinas/tacs2014-2c

Conflicts:
	target/test-classes/com/tacs/truequeLibre/endpoints/FeaturesTest.class