Testing Re-Merge
Merge pull request #3 from JPEGtheDev/InputTesting

Testing Re-Merge