Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
maybe it works this time?! i think so! #58
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
adjusting audio levels #58
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
last merge
Merge branch 'dev'
fixing HAL wav filenames
Merge tag 'version_1.0' of github.com:the-hobbes/softwareEngineeringFinalProject into dev

This is the release ready version for the application
Merge branch 'master' of github.com:the-hobbes/softwareEngineeringFinalProject into dev
merged in phelans name changes for files