Began memory classes
Resolved merge conflict
Merge branch 'master' of https://github.com/quinston/summative2013
Put everything into one package.