Merge branch 'master' into development
Polished a bunch of stuff. Cancel button works. Preview button removed, but 'View Website' button added.
Add README
Merge branch 'development'