formatting stuff
Merge pull request #13 from mike6838/almost_done

formatting stuff