CanNotComeUpWithACommintMessage
Merge branch 'master' of https://github.com/LuanWH/cs3210-project-mpi-aggressive-queen

Conflicts:
	Project2/3dgol.cu