fixed resume li problem
Merge branch 'comp20' to include resume fixes