Cleaned up braces and indentation; got things working.
Merge branch 'master' of https://github.com/bopwerks/cs481p1
Fixed braces and indentation; got things working.