more interesting changes about farting
Merge branch 'master' of https://github.com/dep22/myfirstgit

I farted on my own head. What wuz I thinking?

Conflicts:
	draft.txt