Merge branch 'master' into prakhar
Minor change in activity_main.xml
Renaming continue.wav file
Merge branch 'prakhar'
Merge branch 'master' into allen