...
...
... Merge branch 'master' of https://github.com/kikinovak/slackware

Conflicts:
	.htaccess