make change on testing branch
again on testing branch
commit on master
fix issue 53 on iss53 branch
hot fix
finished the new footer [issue 53]
fix conflicts