Merge branch 'master' of /Users/quest/Documents/code/HomeWorkApp with conflicts.
Added new class "MyHomework" and in process of creating