completed
change to footer and conflicts
Merge branch 'master' of github.com:vcedeno/VTKnowledge