Merge pull request #2 from codeforseattle/master

meowmeow
Merge pull request #14 from suisea/master

Merge pull request #2 from codeforseattle/master