test merge
Merge branch 'master' of https://github.com/luizgh/masters_deeplearning

Conflicts:
	TreeClassification/TreeImage.py