assimp nya jd <>
l
Merge branch 'master' of https://github.com/bey0nd/FP-GRAFKOM2013

Conflicts:
	Main.cpp