Mario: finished pset4 on dependency injection using the Spring framework.
Merge origin/master

Conflicts:
	src/mario/Mario.java
	src/mario/PyramidFilePrinter.java
	src/mario/PyramidPrinter.java
	src/mario/PyramidScreenPrinter.java