switched method ordering
Merge branch 'master' of https://github.com/helenhe/cs3240-f14-team02