Merge branch 'master' of C:\Users\Shane\Desktop\Java\Git\javaide with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Shane - commit test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Shane - commit test