Merge pull request #26 from vikinghug/Implementing-Settings-&-Fixing-Resize-Bug

Implementing settings & fixing resize bug
Merge branch 'master' into design-changes