footer
Fixed footer css
Merging issue-4 into develop and resolved conflicts