deleted:    default/art/ol.ans
	deleted:    default/ol.ans
	modified:   default/ol.py
	default/art/oneliner.ans
	default/art/oneliner100.ans
	modified:   x84/default/ol.py
	x84/default/art/oneliner.ans
	x84/default/art/oneliner100.ans
	new file:   default/art/oneliner.ans
	new file:   default/art/oneliner100.ans
Merge remote-tracking branch 'upstream/master'
	renamed:    art/automsg.ans -> extras/art/automsg.ans
	renamed:    automsg.py -> extras/automsg.py
        renamed:    ../extras/lb_main.py -> extras/lb_main.py
	modified:   ol.py
Merge pull request #128 from ericolito/master

	deleted:    default/art/ol.ans