Includes.h changed to include everything. Files cleaned up. Statics removed. ShuntingYard added to controller class.
Merge branch 'master' of https://github.com/COP3503group92/CalculatorProject.git