task changes
pull changes
Merge branch 'development'
footer added
minor issue