change to awesome
Merge pull request #2 from johnwfoley/branch_three

change to awesome