added footer iss2
added header hotfix
added footer class iss2
Merge branch 'iss2'
add header num
added header num33
fix conflict
fixed merge from remote repo