Added recursive solution to Fibonacci project

The fibonacci function is memoized so it's quite fast,
but there are limits to recursion depth so I'll
also make an iterative solution.
Fixed merge conflict