First commit
Merge branch 'master' of github.com:allen7593/mainWindow