do some modify
Merge branch 'master' of https://github.com/jessehwong/Attendance
Merge branch 'master' of https://github.com/jessehwong/Attendance
Merge branch 'master' of https://github.com/jessehwong/Attendance
bug to be solved