WOW, what a great commit
Major typo, glad I caught that!
Merge pull request #1 from masondesu/cool-new-feature

WOWWWWWWWWWWWWWW
Merge branch 'master' of github.com:masondesu/barf into conflict

Conflicts:
	barf.js