add note about git lol
nyancat in
nyan cat removed + added surprise
trollface added
y me no joinz?
gfoa
random commit!
Fixed `bug` in Batman ASCII, corrected markdown
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
implemented puber jail
fancy heisenberg
Merge branch 'master' of github.com:metachris/metalab-git-workshop
Merge remote-tracking branch 'upstream/master'
HODOR
Merge remote-tracking branch 'upstream/master'
This commit Fixes #33
changed readme to provoke conflict
another chnage in readme
Merge branch 'featurebranch' into f2

Conflicts:
	README.md