more functionality
Merge branch 'master' of https://github.com/THOROW-WAX/PHP-Teamwork