JohannaMW/battlefit — pull request #18 by chuckcwh (2014-11-09 17:27:39+00:00)
Title: Chuck dev

add and fix conflict