Merge pull request #20 from mattphoto/mattkim

matt kim
this commit is baaaaad

No, for real–it's wrong.
add a p tag for kicks
Merge pull request #1 from afshinator/master

practicing with my buddy