Changes from the MNA 2013 class
Cleaned up
Merge branch 'master' of https://github.com/leonfrench/ABAMS.git