Merged Shunting Yard with Evaluate
Merge pull request #22 from jasonchuah93/master

 Merged Shunting Yard with Evaluate