Added composer.lock to gitignore
Merged with Anna(Added ACL, some changes in table classes)
Removed BOM from ACL class
Merge branch 'develop' of github.com:blackAcid/php-education-project into develop
Added user controller
Merge branch 'develop' into feature-email
Added template and getting settings from config to Mail
Merge pull request #16 from Lamp27/develop

Develop