Merged homework and master branches