Committer: Guandao Yang <Grendel@dhcp-gs-3824.redrover.cornell.edu>

 On branch updateAudioJs
 Changes to be committed:
	deleted:    .htaccess
	modified:   .idea/workspace.xml
	modified:   application/views/cali.php
	modified:   application/views/layouts/calibrations/index.php
	modified:   application/views/partials/normal_nav.php
	modified:   js/experiments/audios.js
[bug] a bug appears out from nowhere
 Committer: Guandao Yang <Grendel@dhcp-gs-628.redrover.cornell.edu>
	[debug] fix that stupid and wierd bug

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
 Committer: Guandao Yang <Grendel@dhcp-clara-4596.redrover.cornell.edu>
	[implement] implement the basic audio verification system

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	new file:   application/libraries/data_model/SingleComparison.php
	deleted:    application/libraries/data_model/Single_click.php
	modified:   application/views/cali.php
	modified:   js/experiments/audios.js
 Committer: Guandao Yang <Grendel@dhcp-clara-3034.redrover.cornell.edu>

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	modified:   application/core/MY_Model.php
	new file:   application/libraries/data_model/IntervalVerification.php
	modified:   application/libraries/data_model/SingleComparison.php
	modified:   application/models/parti.php
 Committer: Guandao Yang <Grendel@dhcp-clara-905.redrover.cornell.edu>

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	new file:   application/libraries/data_model/Adverification.php
	new file:   application/views/calibrations/asdscalibration.php
	renamed:    application/views/cali.php -> application/views/calibrations/cali.php
	new file:   js/calibrations/asdscalibration.js
	modified:   js/experiments/audios.js
 Committer: Guandao Yang <Grendel@dhcp-clara-1342.redrover.cornell.edu>
	[add] finish the calibration!

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	modified:   application/libraries/data_model/Adverification.php
	modified:   application/libraries/data_model/IntervalVerification.php
	renamed:    application/views/calibrations/asdscalibration.php -> application/views/calibrations/asds_cali.php
	new file:   application/views/calibrations/interval_cali.php
	new file:   js/calibrations/interval_cali.js
 Committer: Guandao Yang <Grendel@dhcp-clara-6472.redrover.cornell.edu>
	[debug] debug calibration

 On branch updateAudioJs
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	modified:   application/libraries/data_model/Adverification.php
	modified:   application/libraries/data_model/IntervalVerification.php
	modified:   application/models/parti.php
	modified:   application/views/calibrations/asds_cali.php
	modified:   application/views/calibrations/interval_cali.php
	new file:   application/views/layouts/practice/index.php
	modified:   js/calibrations/asdscalibration.js
	modified:   js/calibrations/interval_cali.js
 Committer: Guandao Yang <Grendel@dhcp-clara-2218.redrover.cornell.edu>
	[fix] fix the to-do-list

 On branch updateAudioJs
 Changes to be committed:
	modified:   .DS_Store
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	modified:   application/core/MY_Controller.php
	modified:   application/libraries/data_model/Adverification.php
	modified:   application/libraries/data_model/IntervalVerification.php
	modified:   application/views/calibrations/asds_cali.php
	modified:   application/views/calibrations/interval_cali.php
	modified:   application/views/index.php
	modified:   application/views/instr.php
	modified:   application/views/layouts/calibrations/index.php
	modified:   application/views/layouts/instructions/index.php
	modified:   application/views/partials/normal_nav.php
	new file:   images/.DS_Store
	new file:   images/logo_2g.jpg
	modified:   js/calibrations/asdscalibration.js
	modified:   js/calibrations/interval_cali.js
update almost done with calibration