minor changes
Merge branch 'master' of https://github.com/j08lue/hpcompassignment

Conflicts:
	main.f90