Initial commit
Get rid of class files
Fixed certain things
fixed conflict