updated everything that we kept off for presentation reasons
fixed syntax issue
Merge branch 'master' of https://github.com/elanas/TheCrazySix