-- updated ormatting and modifying some questionable code

-- need to pass the test!
Merge branch 'master' of https://github.com/COMP354-2014-4/spreadsheet