modified attendance and year plan.
Merge remote-tracking branch 'origin/master'
check
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
check
Merge remote-tracking branch 'origin/master'

Conflicts:
	manaDB.sql
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml