Initial Commit
Merge https://github.com/orman112/screenshot-redesign