Commit to stop git complaining
Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenMPTaskLevel/optiqtm
	OpenMPTaskLevel/pruning.o
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Merge branch 'master' of http://github.com/sutty17/Parallel-Cubing
Minor modifications