-- edited methods and new method added
Merge branch 'master' of https://github.com/COMP354-2014-4/spreadsheet