Factorial now calculated from different function in differenet class
Merged branch func