Massive Update

I have yet through googling been able to figure out how to do the pull origin you requested last time, but I have fixed the problem of not being able to merge the file. Preview will be out of date since the github software now crashes whenever I try to make a commit, but the sheet itself will be massively improved and that is more important for the end users.