constant akses

constant akses
pull push
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.htaccess