bug fixed
removed bugfix branch
cleanup
week2