Merge branch 'master' of C:\wamp\www\PHP\ProjectX with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php
	eventManagement/eventList.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	dbAccess.php
	eventManagement/eventList.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
converted to sinhala......but im having problems with converting the button names
converted to sinhala......but im having problems with converting the button names
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php
Made some interface changes and added insertTransaction to db access