premerge
merge fix
Merge branch 'master' of https://github.com/hfendi/PP_miniproject

Conflicts:
	GPU/main.cu
CPU cube validation makefile quickfix
prepull
prepull
Merge branch 'master' of github.com:moehabib/PP_miniproject
postpull upstream
removed >>
wrong pull
renamed file
renamed file
fixed brace
Merge pull request #10 from moehabib/master

op2 merge