to merge
Merge branch 'master' of github.com:Mottotime/hpchomework3

Conflicts:
	hw3_2d_async.f90