Merge Everything.
Merge branch 'master' of https://github.com/evramos/fractions-of-a-penny

Conflicts:
	Aarestad_Heidgerken_Ramos.X68