Added sound effects
solving some conflicts
fixing stuff :(
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/R.txt
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	OctoAskT12/project.properties
added one more song
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
update questions when adding one
Merge pull request #101 from ibarreto/master

sound effects and fixed error of not updating the question
merging
merging