fixed load and store
Merge branch 'master' of github.com:stbando/315lab4