Merge branch 'nix-compatibility' of github.com:barisbalic/termodoro into nix-compatibility

Conflicts:
	lib/termodoro/command.rb
Merge branch 'nix-compatibility' of github.com:barisbalic/termodoro into nix-compatibility

Conflicts:
	lib/termodoro/command.rb