Fixed Camera class and made minor adjustments to how a camera is setup. Updated TextureCube class to use a folder path a 6 filenames for each of the different faces.
Fixed conflicts between commits