iitial commit
removed edu.jar
fixed up gitignore merge"