Tried to make things more formal.
Merge branch 'master' of github.com:jesyspa/B3OMI-group-project-datastructures-2014

Conflicts:
	paper/paper.tex