Attendence 1
Attendence
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/faculty.php
Student Attendence Add
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/faculty.php
Attendance Complete Student
Merge pull request #46 from mohit0202/master

Student Attendance Complete