Committer: Guandao Yang <Grendel@dhcp-clara-6166.redrover.cornell.edu>

 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	modified:   .DS_Store
	modified:   .idea/workspace.xml
	modified:   application/config/views.php
	modified:   application/controllers/main.php
	modified:   application/core/MY_Controller.php
	modified:   application/models/audios.php
	modified:   application/models/cali.php
	modified:   application/models/parti.php
	new file:   application/views/cali.php
	modified:   application/views/instr.php
	new file:   application/views/layouts/calibrations/index.php
	modified:   application/views/layouts/instructions/index.php
	modified:   application/views/partials/normal_nav.php
	modified:   application/views/test.php
	modified:   audios/.DS_Store
	new file:   js/experiments/audios.js
	modified:   system/.htaccess
	modified:   system/core/Common.php
	modified:   system/core/Controller.php
	modified:   system/core/Loader.php
	modified:   system/core/Utf8.php
	modified:   system/core/index.html
	modified:   system/database/DB_active_rec.php
	modified:   system/database/DB_cache.php
	modified:   system/database/DB_driver.php
	modified:   system/database/DB_forge.php
	modified:   system/database/DB_result.php
	modified:   system/database/DB_utility.php
	modified:   system/database/drivers/cubrid/cubrid_driver.php
	modified:   system/database/drivers/cubrid/cubrid_forge.php
	modified:   system/database/drivers/cubrid/cubrid_result.php
	modified:   system/database/drivers/cubrid/cubrid_utility.php
	modified:   system/database/drivers/cubrid/index.html
	modified:   system/database/drivers/index.html
	modified:   system/database/drivers/mssql/index.html
	modified:   system/database/drivers/mssql/mssql_driver.php
	modified:   system/database/drivers/mssql/mssql_forge.php
	modified:   system/database/drivers/mssql/mssql_result.php
	modified:   system/database/drivers/mssql/mssql_utility.php
	modified:   system/database/drivers/mysql/index.html
	modified:   system/database/drivers/mysql/mysql_driver.php
	modified:   system/database/drivers/mysql/mysql_forge.php
	modified:   system/database/drivers/mysql/mysql_result.php
	modified:   system/database/drivers/mysql/mysql_utility.php
	modified:   system/database/drivers/mysqli/index.html
	modified:   system/database/drivers/mysqli/mysqli_driver.php
	modified:   system/database/drivers/mysqli/mysqli_forge.php
	modified:   system/database/drivers/mysqli/mysqli_result.php
	modified:   system/database/drivers/mysqli/mysqli_utility.php
	modified:   system/database/drivers/oci8/index.html
	modified:   system/database/drivers/oci8/oci8_driver.php
	modified:   system/database/drivers/oci8/oci8_forge.php
	modified:   system/database/drivers/oci8/oci8_result.php
	modified:   system/database/drivers/oci8/oci8_utility.php
	modified:   system/database/drivers/odbc/index.html
	modified:   system/database/drivers/odbc/odbc_driver.php
	modified:   system/database/drivers/odbc/odbc_forge.php
	modified:   system/database/drivers/odbc/odbc_result.php
	modified:   system/database/drivers/odbc/odbc_utility.php
	modified:   system/database/drivers/pdo/index.html
	modified:   system/database/drivers/pdo/pdo_driver.php
	modified:   system/database/drivers/pdo/pdo_forge.php
	modified:   system/database/drivers/pdo/pdo_result.php
	modified:   system/database/drivers/pdo/pdo_utility.php
	modified:   system/database/drivers/postgre/index.html
	modified:   system/database/drivers/postgre/postgre_driver.php
	modified:   system/database/drivers/postgre/postgre_forge.php
	modified:   system/database/drivers/postgre/postgre_result.php
	modified:   system/database/drivers/postgre/postgre_utility.php
	modified:   system/database/drivers/sqlite/index.html
	modified:   system/database/drivers/sqlite/sqlite_driver.php
	modified:   system/database/drivers/sqlite/sqlite_forge.php
	modified:   system/database/drivers/sqlite/sqlite_result.php
	modified:   system/database/drivers/sqlite/sqlite_utility.php
	modified:   system/database/drivers/sqlsrv/index.html
	modified:   system/database/drivers/sqlsrv/sqlsrv_driver.php
	modified:   system/database/drivers/sqlsrv/sqlsrv_forge.php
	modified:   system/database/drivers/sqlsrv/sqlsrv_result.php
	modified:   system/database/drivers/sqlsrv/sqlsrv_utility.php
	modified:   system/database/index.html
	modified:   system/fonts/index.html
	modified:   system/fonts/texb.ttf
	modified:   system/helpers/array_helper.php
	modified:   system/helpers/captcha_helper.php
	modified:   system/helpers/cookie_helper.php
	modified:   system/helpers/date_helper.php
	modified:   system/helpers/directory_helper.php
	modified:   system/helpers/download_helper.php
	modified:   system/helpers/email_helper.php
	modified:   system/helpers/file_helper.php