commit with file only for my directory
Merge branch 'master' of https://github.com/IvanDimanov/sedmataposoka

Conflicts:
	.htaccess
Merge pull request #16 from cucka/master

Commit only for my directory(ignore list)