Resolved merge issue
Experimenting with the ternary operator

And also sketching out how to thoroughly test the
foundations upon which further tests are based
namely testing that stack_isEmpty and
stack_empty works in a satisfying manner
Resolving merge conflicts