modified:   main.cpp
	modified:   system/GLFW_App.cpp
Merge branch 'master' of github.com:sharavsambuu/rrc-tank

Conflicts:
	main.cpp

	new file:   data/font/fsex2p00_public.ttf
	new file:   data/model/obj/fighter.obj
	new file:   data/model/obj/jeep01.obj
	new file:   data/model/obj/rapide/CREDITS.txt
	new file:   data/model/obj/rapide/black.tga
	new file:   data/model/obj/rapide/carbonFiber.tga
	new file:   data/model/obj/rapide/glass0.tga
	new file:   data/model/obj/rapide/grille1.tga
	new file:   data/model/obj/rapide/grille2.tga
	new file:   data/model/obj/rapide/lights.tga
	new file:   data/model/obj/rapide/nodamage.tga
	new file:   data/model/obj/rapide/rapide.max
	new file:   data/model/obj/rapide/rapide.mtl
	new file:   data/model/obj/rapide/rapide.obj
	new file:   data/model/obj/rapide/rapide.z3d
	new file:   data/model/obj/rapide/rapide_2009.max
	new file:   data/model/obj/rapide/tireA0.tga
	new file:   data/model/obj/rapide/undercarriage.tga
	new file:   data/model/obj/rapide/wheel.tga
	new file:   data/model/obj/rapide/wheel0.tga
	new file:   data/model/obj/sponza/sponza.mtl
	new file:   data/model/obj/sponza/sponza.obj
	new file:   data/model/obj/sponza/textures/Thumbs.db
	new file:   data/model/obj/sponza/textures/background.tga
	new file:   data/model/obj/sponza/textures/background_ddn.tga
	new file:   data/model/obj/sponza/textures/background_ddn.tif
	new file:   data/model/obj/sponza/textures/chain_texture.tga
	new file:   data/model/obj/sponza/textures/chain_texture_ddn.tga
	new file:   data/model/obj/sponza/textures/chain_texture_mask.tga
	new file:   data/model/obj/sponza/textures/lion.tga
	new file:   data/model/obj/sponza/textures/lion2_ddn.tga
	new file:   data/model/obj/sponza/textures/lion_ddn.tga
	new file:   data/model/obj/sponza/textures/spnza_bricks_a_ddn.tga
	new file:   data/model/obj/sponza/textures/spnza_bricks_a_diff.tga
	new file:   data/model/obj/sponza/textures/spnza_bricks_a_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_arch_ddn.tga
	new file:   data/model/obj/sponza/textures/sponza_arch_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_arch_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_ceiling_a_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_ceiling_a_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_column_a_ddn.tga
	new file:   data/model/obj/sponza/textures/sponza_column_a_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_column_a_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_column_b_ddn.tga
	new file:   data/model/obj/sponza/textures/sponza_column_b_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_column_b_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_column_c_ddn.tga
	new file:   data/model/obj/sponza/textures/sponza_column_c_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_column_c_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_curtain_blue_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_curtain_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_curtain_green_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_details_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_details_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_fabric_blue_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_fabric_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_fabric_green_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_fabric_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_flagpole_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_flagpole_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_floor_a_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_floor_a_spec.tga
	new file:   data/model/obj/sponza/textures/sponza_roof_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_thorn_ddn.tga
	new file:   data/model/obj/sponza/textures/sponza_thorn_diff.tga
	new file:   data/model/obj/sponza/textures/sponza_thorn_mask.tga
	new file:   data/model/obj/sponza/textures/sponza_thorn_spec.tga
	new file:   data/model/obj/sponza/textures/vase_ddn.tga
	new file:   data/model/obj/sponza/textures/vase_dif.tga
	new file:   data/model/obj/sponza/textures/vase_hanging.tga
	new file:   data/model/obj/sponza/textures/vase_plant.tga
	new file:   data/model/obj/sponza/textures/vase_plant_mask.tga
	new file:   data/model/obj/sponza/textures/vase_plant_spec.tga
	new file:   data/model/obj/sponza/textures/vase_round.tga
	new file:   data/model/obj/sponza/textures/vase_round_ddn.tga
	new file:   data/model/obj/sponza/textures/vase_round_spec.tga
	modified:   game/Demo02.cpp
	modified:   game/Demo02.hpp
	modified:   game/Demo05.cpp
	new file:   game/Demo06.cpp
	new file:   game/Demo06.hpp
	modified:   game/Game.cpp
	modified:   game/Game.hpp
	modified:   main.cpp
	modified:   system/GLFW_App.cpp
	modified:   system/GLFW_App.hpp