Merge branch 'master' of https://github.com/dot-bin/Arc

Conflicts:
	.gitignore
	Arc Testing/Arc Testing.vcxproj
	Arc.sln
	Arc.workspace
	Arc/Arc.layout
	Arc/Arc.vcxproj.filters
	Arc/Arc.vcxproj.user
	Arc/Arc/Angle.cpp
	Arc/Arc/Angle.h
	Arc/Arc/AngleHelper.cpp
	Arc/Arc/AngleHelper.h
	Arc/Arc/AnimatedComponent.cpp
	Arc/Arc/AnimatedComponent.h
	Arc/Arc/Animation.cpp
	Arc/Arc/Animation.h
	Arc/Arc/ArrayFunc.h
	Arc/Arc/ArrayList.h
	Arc/Arc/ArrayListBuilder.h
	Arc/Arc/AudioSystem.cpp
	Arc/Arc/AudioSystem.h
	Arc/Arc/Buffer.cpp
	Arc/Arc/Buffer.h
	Arc/Arc/Callbacks.h
	Arc/Arc/Circle.cpp
	Arc/Arc/Circle.h
	Arc/Arc/CircleCollider.cpp
	Arc/Arc/CircleCollider.h
	Arc/Arc/Collider.h
	Arc/Arc/Color.cpp
	Arc/Arc/Color.h
	Arc/Arc/Common.h
	Arc/Arc/Console.cpp
	Arc/Arc/Console.h
	Arc/Arc/ConsoleProgram.cpp
	Arc/Arc/ConsoleProgram.h
	Arc/Arc/Defines.h
	Arc/Arc/Delegate.h
	Arc/Arc/DrawableComponent.cpp
	Arc/Arc/DrawableComponent.h
	Arc/Arc/Event.cpp
	Arc/Arc/Event.h
	Arc/Arc/EventData.h
	Arc/Arc/EventDispatcher.cpp
	Arc/Arc/EventDispatcher.h
	Arc/Arc/Font.cpp
	Arc/Arc/Font.h
	Arc/Arc/FrameTime.h
	Arc/Arc/Functions.cpp
	Arc/Arc/Functions.h
	Arc/Arc/GamePad.h
	Arc/Arc/Geom.h
	Arc/Arc/GraphicalProgram.cpp
	Arc/Arc/GraphicalProgram.h
	Arc/Arc/GraphicsSystem.cpp
	Arc/Arc/GraphicsSystem.h
	Arc/Arc/ICollidable.h
	Arc/Arc/IDrawable.h
	Arc/Arc/IDrawableImage.h
	Arc/Arc/IFrameListener.h
	Arc/Arc/IKeyboardListener.h
	Arc/Arc/IMouseListener.h
	Arc/Arc/IPAddress.cpp
	Arc/Arc/IPAddress.h
	Arc/Arc/IPhysicsObject.h
	Arc/Arc/ISerializable.cpp
	Arc/Arc/ISerializable.h
	Arc/Arc/ImageComponent.cpp
	Arc/Arc/ImageComponent.h
	Arc/Arc/InputFunc.cpp
	Arc/Arc/InputFunc.h
	Arc/Arc/InputSourceType.h
	Arc/Arc/InputState.h
	Arc/Arc/InputSystem.cpp
	Arc/Arc/InputSystem.h
	Arc/Arc/InputType.h
	Arc/Arc/Keyboard.h
	Arc/Arc/KeyboardSource.cpp
	Arc/Arc/KeyboardSource.h
	Arc/Arc/Layer.cpp
	Arc/Arc/Layer.h
	Arc/Arc/LinkedList.h
	Arc/Arc/ManagedObject.cpp
	Arc/Arc/ManagedObject.h
	Arc/Arc/Map.h
	Arc/Arc/MathFunc.cpp
	Arc/Arc/MathFunc.h
	Arc/Arc/MathHelper.cpp
	Arc/Arc/MathHelper.h
	Arc/Arc/MemoryTracker.cpp
	Arc/Arc/MemoryTracker.h
	Arc/Arc/Mouse.h
	Arc/Arc/MouseSource.cpp
	Arc/Arc/MouseSource.h
	Arc/Arc/NetworkSystem.cpp
	Arc/Arc/NetworkSystem.h
	Arc/Arc/Origin.cpp
	Arc/Arc/Origin.h
	Arc/Arc/OriginLocation.h
	Arc/Arc/ParseFunc.cpp
	Arc/Arc/ParseFunc.h
	Arc/Arc/PhysicsComponent.cpp
	Arc/Arc/PhysicsComponent.h
	Arc/Arc/Program.cpp
	Arc/Arc/Program.h
	Arc/Arc/Queue.h
	Arc/Arc/RandFunc.cpp
	Arc/Arc/RandFunc.h
	Arc/Arc/Rect.cpp
	Arc/Arc/Rect.h
	Arc/Arc/RectCollider.cpp
	Arc/Arc/RectCollider.h
	Arc/Arc/RenderTarget.cpp
	Arc/Arc/RenderTarget.h
	Arc/Arc/RenderedText.cpp
	Arc/Arc/RenderedText.h
	Arc/Arc/Scene.cpp
	Arc/Arc/Scene.h
	Arc/Arc/ScriptingSystem.cpp
	Arc/Arc/ScriptingSystem.h
	Arc/Arc/ServerSocket.cpp
	Arc/Arc/ServerSocket.h
	Arc/Arc/ShapeComponent.cpp
	Arc/Arc/ShapeComponent.h
	Arc/Arc/Shapes.h
	Arc/Arc/Socket.cpp
	Arc/Arc/Socket.h
	Arc/Arc/SocketType.h
	Arc/Arc/Sound.cpp
	Arc/Arc/Sound.h
	Arc/Arc/Sprite.h
	Arc/Arc/Stack.h
	Arc/Arc/StreamFunc.cpp
	Arc/Arc/StreamFunc.h
	Arc/Arc/StringFunc.cpp
	Arc/Arc/StringFunc.h
	Arc/Arc/StringHelper.cpp
	Arc/Arc/StringHelper.h
	Arc/Arc/SystemComponent.cpp
	Arc/Arc/SystemComponent.h
	Arc/Arc/TextComponent.cpp
	Arc/Arc/TextComponent.h
	Arc/Arc/Texture.cpp
	Arc/Arc/Texture.h
	Arc/Arc/TimeFunc.cpp
	Arc/Arc/TimeFunc.h
	Arc/Arc/Timer.cpp
	Arc/Arc/Timer.h
	Arc/Arc/Unit.cpp
	Arc/Arc/Unit.h
	Arc/Arc/UnitComponent.cpp
	Arc/Arc/UnitComponent.h
	Arc/Arc/Vector2.cpp
	Arc/Arc/Vector2.h
	Debug/Arc.lib
Merge branch 'master' of https://github.com/dot-bin/Arc