debugged
Fixed else problem
Fixed else error
Merge branch 'master' of https://github.com/E-REP/E-REP