Refactor 02_calculator. Added solution to 05_silly_blocks