Initial commit
Merge branch 'master' of https://github.com/XbPCb/ads-board2
Cloned structure + added EmailSender classes
[ADD] comments for errorController and view classes
Merge branch 'master' of https://github.com/nix-php-training/ads-board2 into dev
for merge
Merge branch 'dchepiga-master'
[FIX] after pull from upstream
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	framework/core/Dispatcher.php
	index.php
Pulled from origin/master
Added Paypal.php with paypal class and cacert.pem - ssl for curl
Fixed Paypal.php with paypal class
Added action ConfirmAction() to application/controllers/UserController.php
Merge branch 'sprint1' into develop
Fixed class Paypal.php and added test-code to FrontController.php
Merge branch 'develop' of https://github.com/XbPCb/ads-board2 into develop
Fixed class Paypal.php, added PaypalAction() to application/controllers/UserController.php, deleted testing code from FrontController.php
fix
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	framework/core/Dispatcher.php
	index.php
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	index.php