class things
class fails
add for conflict
Merge branch 'master' of github.com:brandontom/RFTG
class files
class files