modified:   laplace/openacc/c/laplace_solver_openacc.c
Merge branch 'master' of https://github.com/lsuhpchelp/loniworkshop2014

Conflicts:
	laplace/openacc/c/laplace_solver_openacc.c

	modified:   laplace/openacc/c/laplace2d_acc_ver_cudacast.c
	modified:   laplace/openacc/c/laplace_solver_openacc.c
	modified:   laplace/openacc/c/makefile
	modified:   laplace/openacc/c/subg.pbs
	modified:   laplace/serial/subs.pbs
	new file:   matmul/openacc/c/matmul.c
	modified:   laplace_solver_openacc.c
	modified:   rlapacc.sh
	modified:   ../../../matmul/openacc/c/matmul.c