test
foo
B
C
E
F
G
cleanup
G
Merge branch 'wicked'

Conflicts:
	test
continuing on master
Merge branch 'master' of github.com:randombrein/yolo-octo-shame