placeholder commit before pulling potentially dangerous code
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
 fixed issue with div in select difficulty
added sounds for difficulty page
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
Merge branch 'dev' of https://github.com/the-hobbes/softwareEngineeringFinalProject into dev
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
stuff
updated file naming conventions