Added more code
Added more code
Fixed routing bug
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/routing.php
Moved bootstrapping from index.php to class
Moved bootstrap so that we have only one for both the application and the testing (for the testing it may change or get extended)
Fixed bugs with PHPUnit setup
Added database config
Code reformat
Added database models (unit testing does not work
Merge pull request #3 from brian978/develop

Develop