This is just a test on how to use git for windows. Disregard.
Testing
Merge remote-tracking branch 'origin/master'