first
client version committed
database file added
Merge branch 'master' of https://github.com/ravindram/studentplacement

Conflicts:
	services/app/Config/core.php
	services/app/Controller/CandidateTestResponsesController.php
	services/app/Controller/CandidateTestsController.php
	services/app/Controller/CandidatesController.php
	services/app/Controller/CollegesController.php
	services/app/Controller/QuestionsController.php
	services/app/Controller/TestQuestionsController.php
	services/app/Controller/TestsController.php
	services/app/Controller/UsersController.php
	services/app/Model/Candidate.php
	services/app/Model/CandidateTest.php
	services/app/Model/CandidateTestResponse.php
	services/app/Model/College.php
	services/app/Model/Question.php
	services/app/Model/Test.php
	services/app/Model/TestQuestion.php
	services/app/Model/User.php