Changed div id=header to header
Merge branches master and Fran