Merge origin/master

Conflicts:
	src/mario/Mario.java
	src/mario/PyramidFilePrinter.java
	src/mario/PyramidPrinter.java
	src/mario/PyramidScreenPrinter.java
CoinCalculator Greedy project for LaunchCode