Added in fire to hard difficulty
fixed merge conflicts
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
stuff