Merge branch 'master' of https://github.com/jamesfolberth/compla

Conflicts:
	homework_02/p03.f08
Merge branch 'master' of https://github.com/jamesfolberth/compla

Conflicts:
	homework_02/p03.f08