Ignore log/ & config.php
Ignore .lock
Ignore upload dir
htaccess fix for subdir location
Fix bookmark link
Merge pull request #12 from LevChurakov/gitignore_fix

Gitignore fix
Merge pull request #13 from LevChurakov/issue-9

Fix Issue #9