<<<<<<< HEAD ======= >>>>>>> cb058928 (Commit VS Studio Changes)