Delete MainScreen.py~
Merge pull request #42 from mreist/Jay

Jay
Merge pull request #43 from mreist/master

Merging jay to master