Updated Stable.
	modified:   src/Game.cpp
	modified:   src/Game.h
	modified:   src/GlobalsAreBad.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	new file:   src/Projectiles.cpp
	new file:   src/Projectiles.h
	new file:   src/Robot.cpp
	new file:   src/Robot.h
	modified:   src/Terrain.h
	modified:   src/World.cpp
	modified:   src/World.h
	modified:   src/main.cpp
	modified:   src/stdafx.h
Updated Stable
	deleted:    media/materials/assassin.mesh
	new file:   media/materials/flare.material
	new file:   media/materials/trail.material
	renamed:    media/materials/ninja.mesh -> media/models/ninja.mesh
	renamed:    media/materials/ninja.skeleton -> media/models/ninja.skeleton
	new file:   media/models/robot.jpg
	new file:   media/models/robot.material
	new file:   media/models/robot.mesh
	new file:   media/models/robot.skeleton
	new file:   media/textures/flare.png
	new file:   media/textures/ribbonband.png
	new file:   media/textures/skybox.zip
	modified:   src/Game.cpp
	modified:   src/Game.h
	modified:   src/GlobalsAreBad.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	new file:   src/Projectiles.cpp
	new file:   src/Projectiles.h
	new file:   src/Robot.cpp
	new file:   src/Robot.h
	modified:   src/Terrain.h
	modified:   src/World.cpp
	modified:   src/World.h
	modified:   src/main.cpp
	modified:   src/stdafx.h
Merge branch 'master2' of github.com:fafshari/Omega into master2
Updated Stable

	deleted:    media/materials/assassin.mesh
	new file:   media/materials/flare.material
	modified:   media/materials/sky.material
	new file:   media/materials/trail.material
	renamed:    media/materials/ninja.mesh -> media/models/ninja.mesh
	renamed:    media/materials/ninja.skeleton -> media/models/ninja.skeleton
	new file:   media/models/robot.jpg
	new file:   media/models/robot.material
	new file:   media/models/robot.mesh
	new file:   media/models/robot.skeleton
	new file:   media/textures/flare.png
	new file:   media/textures/ribbonband.png
	new file:   media/textures/skybox.zip
	modified:   src/Game.cpp
	modified:   src/Game.h
	modified:   src/GlobalsAreBad.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	new file:   src/Projectiles.cpp
	new file:   src/Projectiles.h
	new file:   src/Robot.cpp
	new file:   src/Robot.h
	modified:   src/Terrain.h
	modified:   src/World.cpp
	modified:   src/World.h
	modified:   src/main.cpp
	modified:   src/stdafx.h
Merge branch 'master2' of github.com:fafshari/Omega into master2
Updated Stable

	deleted:    media/materials/assassin.mesh
	new file:   media/materials/flare.material
	modified:   media/materials/sky.material
	new file:   media/materials/trail.material
	renamed:    media/materials/ninja.mesh -> media/models/ninja.mesh
	renamed:    media/materials/ninja.skeleton -> media/models/ninja.skeleton
	new file:   media/models/robot.jpg
	new file:   media/models/robot.material
	new file:   media/models/robot.mesh
	new file:   media/models/robot.skeleton
	new file:   media/textures/flare.png
	new file:   media/textures/ribbonband.png
	new file:   media/textures/skybox.zip
	modified:   resources.cfg
	modified:   src/Game.cpp
	modified:   src/Game.h
	modified:   src/GlobalsAreBad.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	new file:   src/Projectiles.cpp
	new file:   src/Projectiles.h
	new file:   src/Robot.cpp
	new file:   src/Robot.h
	modified:   src/Terrain.h
	modified:   src/World.cpp
	modified:   src/World.h
	modified:   src/main.cpp
	modified:   src/stdafx.h
Merge branch 'master2' of github.com:fafshari/Omega into master2
Added abstract class Movable

Any entity that extends Movable must implement the update() function
	new file:   src/Movable.h
Added virtual destructor for Movable.h
	modified:   src/Movable.h
Added PlayerControllers. Replaced tabs with spaces

ThirdPersonController
SideScrollController

	modified:   src/Player.cpp
	modified:   src/Player.h
	modified:   src/Projectiles.cpp
	modified:   src/WindowsConsole.cpp
	modified:   src/WindowsConsole.h
	modified:   src/World.cpp
	modified:   src/World.h
Implemented fundamentals. Refer to details below.

Created a Entity object which will be the base object for all visible
objects.

Created MovableEntity as the child of Entity. Implements update() function

Created AnimableEntity as the child of MovableEntity. Implements AI and
animations in the update function.

Creating test Ninja object to test out the above implementations.

The multiple PlayerControllers in World are now declared as Controller.
and are constructed with more detail in the cpp file.
	Ex. World.h

		Controller* c;

	World.cpp

		c = new XYZController(...);

This is a stable build but is not recommended to used as a base build.

	new file:   media/models/ninja.jpg
	new file:   media/models/ninja.material
	new file:   media/textures/stevecube_BK.jpg
	new file:   media/textures/stevecube_DN.jpg
	new file:   media/textures/stevecube_FR.jpg
	new file:   media/textures/stevecube_LF.jpg
	new file:   media/textures/stevecube_RT.jpg
	new file:   media/textures/stevecube_UP.jpg
	new file:   src/AnimableEntity.cpp
	new file:   src/AnimableEntity.h
	new file:   src/Controller.h
	new file:   src/Entity.cpp
	new file:   src/Entity.h
	deleted:    src/Movable.h
	new file:   src/MovableEntity.cpp
	new file:   src/MovableEntity.h
	new file:   src/Ninja.cpp
	new file:   src/Ninja.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	modified:   src/Robot.h
	modified:   src/World.cpp
	modified:   src/World.h
Robot object to be child of AnimableEntity.

Increased Ninjas msDefaultWalkSpeed to 1.2f

	modified:   src/Ninja.cpp
	modified:   src/Robot.cpp
	modified:   src/Robot.h
	modified:   src/World.cpp
Removed entityName parameter in Entity Constructor

Grouped member variables in all the controller objects into Controller

	modified:   media/models/ninja.material
	modified:   src/AnimableEntity.cpp
	modified:   src/AnimableEntity.h
	new file:   src/Controller.cpp
	modified:   src/Controller.h
	modified:   src/Entity.cpp
	modified:   src/Entity.h
	modified:   src/MovableEntity.cpp
	modified:   src/MovableEntity.h
	modified:   src/Ninja.cpp
	modified:   src/Player.cpp
	modified:   src/Player.h
	modified:   src/Robot.cpp
Player object extends AnimableEntity.

SideScrollController configured to work with new Player object
Player object animates when KeyPressed

Animations implemented
	IDLE
	WALK
	JUMP_NO_HEIGHT

	modified:   src/Ninja.cpp
	modified:   src/Ninja.h
	modified:   src/Player.cpp
	modified:   src/Player.h
	modified:   src/World.cpp