Added composer.lock to gitignore
Merged with Anna(Added ACL, some changes in table classes)
Removed BOM from ACL class
Merge pull request #14 from blackAcid/develop

added acl
Merge branch 'develop' of github.com:blackAcid/php-education-project into develop
Added user controller
Merge branch 'develop' into feature-email
Merge pull request #15 from blackAcid/master

modify css files and acl.php
Added template and getting settings from config to Mail
fix Acl.php, stable version.
Merge pull request #17 from skin4ik/master

fix Acl.php, stable version ACL.
Merge pull request #16 from Lamp27/develop

Develop
modify css load
merge with baziak