added working modal
modal now renders partial
Merge remote-tracking branch 'upstream/master' into settings
Merge pull request #37 from ernbrn/settings

Settings