Merge branch 'master' of C:\Users\Casey\Documents\IntelliJ_Projects\school-java with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
changes to get
changes to get
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
changes to get