Commit 2: Main window
Merge pull request #1 from dmoro33/master

Commit 2: Main window