I had to push it
Merge branch 'master' into Christian
Added in the ability to read in excel files. Also switch from using the grails database to using the manually generated one for each user, in order to keep all points and files seperate