Using dirname instead of /home/mero
auto get screen resolution, if none is given
Merge pull request #1 from joker234/patch-home

Using dirname instead of /home/mero
fix string encoding
Gracefully handle symlinks
Merge pull request #2 from joker234/resize-patch

auto get screen resolution, if none is given
Typo in timezone
Merge remote-tracking branch 'remotes/pseyfert/quickfix'

Conflicts:
	lock.sh