fixed PArams
added files made by javacc compiling
keeping up with behind commits
resolving merge