Merge remote-tracking branch 'origin/master'

Conflicts:
	main.php

Not sure what this is

For some reason I have uncommitted changes?
Merge remote-tracking branch 'origin/master'

Conflicts:
	dataConnect.php
	main.php