-added a TODO comment for alex
-formatting changes
Merge branch 'master' of https://github.com/joubin/CSC191