Merge branch 'master' of https://github.com/Raydivine/Calculator
Merge branch 'master' of https://github.com/Raydivine/Calculator
Merge pull request #23 from mygamelife/master

Merged Evaluate.c and getToken