Stashing before pulling
Merge branch 'master' of https://github.com/mpatt3970/PlayMaker

Conflicts:
	src/playMaker/Field.java
Merge branch 'master' of https://github.com/mpatt3970/PlayMaker

Conflicts:
	src/playMaker/PlayMaker.java
Loading the three different defensive formations successfully.
Merge branch 'master' of https://github.com/mpatt3970/PlayMaker

Conflicts:
	src/playMaker/SelectPlaysPanel.java
Merge branch 'master' of https://github.com/mpatt3970/PlayMaker

Conflicts:
	src/playMaker/SelectPlaysPanel.java
	src/playMaker/Team.java