Made array size a constant in the header, removed main function from data.cu
Merge branch 'SteveBranch' into wrappers