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

Conflicts:
	barf.js
Merge pull request #3 from masondesu/conflict

OOOOOOOOOOOH boy