this is my test2 file
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/GuardianController.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Add MySQL connection Info.
Add the data to the database