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

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

Conflicts:
	.idea/workspace.xml
new staff update still not working