Changes

== Meetings ==* (latest will be on top) ==# * [[(Irc)logs of meeting number ### - oop344 20113 | Branching in Github Merging and Solve Merging Problems and Nov. 59: ]]Meeting held Audio conference in IRCSkype. Discussed how the problems on merging. There were some errors when merging branch back to use GUI master. It prompted that there were unmerged files and command line merge conflict. Explored those problem. Finally, all branches were merged to create branches, create issues and make pull requestsmaster by resetting it.# * [[(Irc)logs of meeting number ### - oop344 20113 | Branching Again in Git and Nov. 8: ]]Met in person in school. Discussed more details on previous topics.# * [[(Irc)logs of meeting number ### - oop344 20113 | Merging and Solve Merging Problems Branching in Github and Nov. 95: ]]Audio conference Meeting held in SkypeIRC. Discussed the problems on merging. There were some errors when merging branch back how to master. It prompted that there were unmerged files use GUI and merge conflict. Explored those problem. Finallycommand line to create branches, all branches were merged to master by resetting itcreate issues and make pull requests.