changed whitespacing
Merge branch 'master' of https://github.com/tpoulos/IS_group_project