Master Merge
kevins feta shadermojs
Andre update
Andre Merge
Orginal
Merge&Shaders
SUPER MERGE
NEW NEW
Merge branch 'master' into mattias

Conflicts:
	PacmanReloaded/.gitignore
	PacmanReloaded/PacMan/AABB.cpp
	PacmanReloaded/PacMan/AABB.h
	PacmanReloaded/PacMan/AI.cpp
	PacmanReloaded/PacMan/AI.h
	PacmanReloaded/PacMan/BlinkyAI.cpp
	PacmanReloaded/PacMan/BlinkyAI.h
	PacmanReloaded/PacMan/BoundingBox.fx
	PacmanReloaded/PacMan/BoundingVolume.cpp
	PacmanReloaded/PacMan/BoundingVolume.h
	PacmanReloaded/PacMan/Buffer.cpp
	PacmanReloaded/PacMan/Buffer.h
	PacmanReloaded/PacMan/Camera.cpp
	PacmanReloaded/PacMan/Camera.h
	PacmanReloaded/PacMan/Candy.cpp
	PacmanReloaded/PacMan/Candy.h
	PacmanReloaded/PacMan/Cherry.cpp
	PacmanReloaded/PacMan/Cherry.h
	PacmanReloaded/PacMan/ClydeAI.cpp
	PacmanReloaded/PacMan/ClydeAI.h
	PacmanReloaded/PacMan/Effects.cpp
	PacmanReloaded/PacMan/Effects.h
	PacmanReloaded/PacMan/Enemy.cpp
	PacmanReloaded/PacMan/Enemy.h
	PacmanReloaded/PacMan/ExampleScene.cpp
	PacmanReloaded/PacMan/ExampleScene.h
	PacmanReloaded/PacMan/Factory.cpp
	PacmanReloaded/PacMan/Factory.h
	PacmanReloaded/PacMan/GenerallStructs.h
	PacmanReloaded/PacMan/HID.cpp
	PacmanReloaded/PacMan/HID.h
	PacmanReloaded/PacMan/HIDObservable.cpp
	PacmanReloaded/PacMan/HIDObservable.h
	PacmanReloaded/PacMan/InkyAI.cpp
	PacmanReloaded/PacMan/InkyAI.h
	PacmanReloaded/PacMan/Instancing.cpp
	PacmanReloaded/PacMan/Instancing.fx
	PacmanReloaded/PacMan/Instancing.h
	PacmanReloaded/PacMan/Keyboard.cpp
	PacmanReloaded/PacMan/Keyboard.h
	PacmanReloaded/PacMan/Level.cpp
	PacmanReloaded/PacMan/Level.h
	PacmanReloaded/PacMan/Main.cpp
	PacmanReloaded/PacMan/Main.h
	PacmanReloaded/PacMan/MainMenuScene.h
	PacmanReloaded/PacMan/ModelLoader.cpp
	PacmanReloaded/PacMan/ModelLoader.h
	PacmanReloaded/PacMan/ModelManager.cpp
	PacmanReloaded/PacMan/ModelManager.h
	PacmanReloaded/PacMan/ModelStructs.cpp
	PacmanReloaded/PacMan/ModelStructs.h
	PacmanReloaded/PacMan/Mouse.cpp
	PacmanReloaded/PacMan/Mouse.h
	PacmanReloaded/PacMan/Object.cpp
	PacmanReloaded/PacMan/Object.h
	PacmanReloaded/PacMan/Observer.cpp
	PacmanReloaded/PacMan/Observer.h
	PacmanReloaded/PacMan/PacMan.vcxproj
	PacmanReloaded/PacMan/PacMan.vcxproj.filters
	PacmanReloaded/PacMan/PacMan.vcxproj.user
	PacmanReloaded/PacMan/Pacman.cpp
	PacmanReloaded/PacMan/Pacman.h
	PacmanReloaded/PacMan/PinkyAI.cpp
	PacmanReloaded/PacMan/PinkyAI.h
	PacmanReloaded/PacMan/PowerUp.cpp
	PacmanReloaded/PacMan/PowerUp.h
	PacmanReloaded/PacMan/Resources/Models/Box.mtl
	PacmanReloaded/PacMan/Resources/Models/Cherry.mtl
	PacmanReloaded/PacMan/Resources/Models/Cherry.obj
	PacmanReloaded/PacMan/Resources/Models/Ghost.mtl
	PacmanReloaded/PacMan/Resources/Models/Ghost.obj
	PacmanReloaded/PacMan/Resources/Models/Ghost_Angry.mtl
	PacmanReloaded/PacMan/Resources/Models/Ghost_Angry.obj
	PacmanReloaded/PacMan/Resources/Models/Ghost_Dead1.mtl
	PacmanReloaded/PacMan/Resources/Models/Ghost_Dead1.obj
	PacmanReloaded/PacMan/Resources/Models/Ghost_Dead2.mtl
	PacmanReloaded/PacMan/Resources/Models/Ghost_Dead2.obj
	PacmanReloaded/PacMan/Resources/Models/PacMan_Closed.mtl
	PacmanReloaded/PacMan/Resources/Models/PacMan_Closed.obj
	PacmanReloaded/PacMan/Resources/Models/PacMan_Open.mtl
	PacmanReloaded/PacMan/Resources/Models/PacMan_Open.obj
	PacmanReloaded/PacMan/Scene.cpp
	PacmanReloaded/PacMan/Scene.h
	PacmanReloaded/PacMan/SceneManager.cpp
	PacmanReloaded/PacMan/SceneManager.h
	PacmanReloaded/PacMan/Shader.cpp
	PacmanReloaded/PacMan/Shader.h
	PacmanReloaded/PacMan/Shaders.cpp
	PacmanReloaded/PacMan/Shaders.h
	PacmanReloaded/PacMan/Sprite.cpp
	PacmanReloaded/PacMan/Sprite.h
	PacmanReloaded/PacMan/SpriteButton.cpp
	PacmanReloaded/PacMan/SpriteButton.h
	PacmanReloaded/PacMan/Terrain.cpp
	PacmanReloaded/PacMan/Terrain.fx
	PacmanReloaded/PacMan/Terrain.h
	PacmanReloaded/PacMan/VertexStructs.h
	PacmanReloaded/PacMan/Wall.cpp
	PacmanReloaded/PacMan/Wall.h
	PacmanReloaded/PacMan/WorldLoader.cpp
	PacmanReloaded/PacMan/WorldLoader.h
	PacmanReloaded/PacMan/d3dApp.cpp
	PacmanReloaded/PacMan/d3dApp.h
	PacmanReloaded/PacMan/d3dUtil.h
	PacmanReloaded/PacMan/resource.h
	PacmanReloaded/PacMan/stdafx.h
	PacmanReloaded/PacmanReloaded.sln
	PacmanReloaded/PacmanReloaded.suo