Merge branch 'master' of https://github.com/jotaemepereira/TDI-2014-5

Conflicts:
	Lab3/SoulTree/SoulTree.pde