Added Hippy-Dippy mode
Fixed merge conflict caused by #includes
Merge branch 'master' of https://github.com/jayspur11/Graphics_Program_One