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

 On branch master
 Your branch is up-to-date with 'origin/master'.
	[add] add the function to login

 Changes to be committed:
	new file:   .htaccess
	modified:   application/config/config.php
	modified:   application/config/routes.php
	modified:   application/controllers/main.php
	modified:   application/models/parti.php
	modified:   application/views/index.php
	new file:   application/views/instr.php
	modified:   application/views/layouts/instructions/index.php
	new file:   audios/.DS_Store
	renamed:    "audios/\344\270\200\350\267\257\345\220\221\345\214\227.mp3" -> audios/1f8879bd79edeb6160a300a3c60fa0780cab08d3.mp3
	renamed:    audios/song.mp3 -> audios/ab4337c62a6e1217304c87ea57f608290c8c9ac7.mp3
	modified:   js/index.js
	new file:   js/jquery.js
 Committer: Guandao Yang <Grendel@Guandaos-MacBook-Pro.local>

 On branch master
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
 Committer: Guandao Yang <Grendel@dhcp-clara-2383.redrover.cornell.edu>

 On branch master
 Your branch is ahead of 'origin/master' by 2 commits.
   (use "git push" to publish your local commits)

 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   application/controllers/main.php
	modified:   application/models/instr.php
	modified:   application/views/instr.php
	modified:   application/views/layouts/instructions/index.php
	new file:   application/views/partials/normal_nav.php