Formatting
Merge branch 'master' of https://github.com/csah632/hw2