Merge branch 'master' into dev
fixed simple formatting to make it look nice and make more user friendly
Merge branch 'formatFix' into dev
Removed trailing whitespace
Merge pull request #1 from GUTeamU/formatFix

Removed trailing whitespace
Merge pull request #2 from GUTeamU/dev

Dev