New button stuff
Merge branch 'master' of https://www.github.com/mjw323/LostCloudSource