cambios
Merge branch 'master' of github.com:leofigy/Cin2014

Conflicts:
	course/week2/practical/base_pointer.cpp
	course/week2/practical/data.a
	course/week2/practical/data.o
	course/week2/practical/final_all.exec
	course/week2/practical/final_obj.exec
	course/week2/practical/final_static_all.exec
Merge branch 'master' of github.com:leofigy/Cin2014
Homework 2 Diego Hernandez / César López