Merge branch 'master' of https://github.com/jesyspa/B3OMI-group-project-datastructures-2014

Conflicts:
	final_presentation/presentation.synctex.gz