#1 : updated gitignore
#3 : Updated tree loading
#1 : updated gitignore
Merge branch 'master' of https://github.com/vbogretsov/academy

Conflicts:
	src/.gitignore