this is apparently a summary

this is probably a description
Merge pull request #1 from tilderain/master

this is apparently a summary