Whoops
Oops
Merge branch 'alpha' into alpha-generic

Conflicts:
	content/characters/Red/NL.mv
	content/characters/Red/NS.mv
	content/characters/Red/W.mv
	content/characters/Red/WQ.mv
	content/characters/Yellow/NL.mv
	content/characters/Yellow/NS.mv
	content/characters/Yellow/W.mv
	content/characters/Yellow/WQ.mv
	src/charlist.h