final edits
Merge pull request #4 from tiffanyhwang/master

final edits