Merge conflict resolved and Refactored Addressbook in gui test ti TaskManager

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>addressbook-level4</name>
+	<name>main</name>
 	<comment>Project addressbook-level4 created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -28,7 +28,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1476898072165</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -37,7 +37,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1476898072188</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>

LICENSE

@@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Software, and to permit tasks to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all

README.md

@@ -1,34 +1,28 @@
-# Address Book (Level 4)
+# Doit
 
-[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
-[![Build status](https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true)](https://ci.appveyor.com/project/damithc/addressbook-level4)
-[![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a)](https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade)
+[![Build Status](https://travis-ci.org/CS2103JAN2017-W14-B3/addressbook-level4.svg?branch=master)](https://travis-ci.org/CS2103JAN2017-W14-B3/main)
+[![Build status](https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true)]
+(https://ci.appveyor.com/project/jinshunlee/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103JAN2017-W14-B3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103JAN2017-W14-B3/main?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/02ba7ff85b714d3eb7f9ede4c067856e)](https://www.codacy.com/app/jinshunlee/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103JAN2017-W14-B3/main&utm_campaign=Badge_Grade)
 
 <img src="docs/images/Ui.png" width="600"><br>
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using
+* This is a desktop Task Manager application. It has a GUI but most of the user interactions happen using
   a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as
-  the main programming language.
-* It is **written in OOP fashion**. It provides a **reasonably well-written** code example that is
-  **significantly bigger** (around 6 KLoC)than what students usually write in beginner-level SE modules.
-* What's different from [level 3](https://github.com/se-edu/addressbook-level3):
-    * A more sophisticated GUI that includes a list panel and an in-built Browser.
-    * More test cases, including automated GUI testing.
-    * Support for *Build Automation* using Gradle and for *Continuous Integration* using Travis CI.
+* It is a Java application intended for working professionals to track and manage tasks efficiently.
+* It is **written in OOP fashion**. It samples the **Address Book (Level 4)** code provided as part of the module.
 
 
 #### Site Map
 * [User Guide](docs/UserGuide.md)
 * [Developer Guide](docs/DeveloperGuide.md)
-* [Learning Outcomes](docs/LearningOutcomes.md)
 * [About Us](docs/AboutUs.md)
 * [Contact Us](docs/ContactUs.md)
 
 
 #### Acknowledgements
-
+* The sample project is created by [SE-EDU initiative](https://github.com/se-edu/)
 * Some parts of this sample application were inspired by the excellent
   [Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.
 

docs/AboutUs.md

@@ -4,49 +4,60 @@ We are a team based in the [School of Computing, National University of Singapor
 
 ## Project Team
 
-#### [Damith C. Rajapakse](http://www.comp.nus.edu.sg/~damithch) <br>
-<img src="images/DamithRajapakse.jpg" width="150"><br>
-**Role**: Project Advisor
 
------
 
-#### [Joshua Lee](http://github.com/lejolly)
-<img src="images/JoshuaLee.jpg" width="150"><br>
-Role: Developer <br>
-Responsibilities: UI
+
+#### [Lee Jin Shun](http://github.com/jinshunlee)
+<img src="images/jinshunlee.png" width="150"><br>
+Role: Project Leader <br>
+Responsibilities:
+* In charge of Integration
+* In charge of Deliverables and Deadlines
+* In charge of Logic Component
+
 
 -----
 
-#### [Leow Yijin](http://github.com/yijinl)
-<img src="images/LeowYijin.jpg" width="150"><br>
+#### [Chew Chia Sin](http://github.com/Fyelight)
+<img src="images/fyelight.png" width="150"><br>
 Role: Developer <br>
-Responsibilities: Data
+Responsibilities:
+* In charge of Scheduling and Tracking
+* In charge of Storage Component
+
 
 -----
 
-#### [Martin Choo](http://github.com/m133225)
-<img src="images/MartinChoo.jpg" width="150"><br>
+#### [Hon Kean Wai](http://github.com/drtrifle)
+<img src="images/drtrifle.png" width="150"><br>
 Role: Developer <br>
-Responsibilities: Dev Ops
+Responsibilities:
+* In charge of Documentation
+* In charge of Testing
+* In charge of Model Component
 
------
 
-#### [Thien Nguyen](https://github.com/ndt93)
- Role: Developer <br>
- Responsibilities: Threading
+-----
 
- -----
+#### [Ye Huanhui](https://github.com/yexiexie)
+<img src="images/yexiexie.png" width="150"><br>
+Role: Developer <br>
+Responsibilities:
+* In charge of Code Quality
+* In charge of UI
 
-#### [You Liang](http://github.com/yl-coder)
-<img src="images/YouLiang.jpg" width="150"><br>
- Role: Developer <br>
- Responsibilities: UI
+-----
 
- -----
 
 # Contributors
 
 We welcome contributions. See [Contact Us](ContactUs.md) page for more info.
 
 * [Akshay Narayan](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Aokkhoy)
 * [Sam Yong](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Amauris)
+* [Damith C. Rajapakse](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)
+* [Joshua Lee](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)
+* [Leow Yijin](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)
+* [Martin Choo](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)
+* [You Liang](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)
+* [Thien Nguyen](https://github.com/nus-cs2103-AY1617S2/addressbook-level4)

docs/AboutUs.md.rej

@@ -0,0 +1,9 @@
+diff a/docs/AboutUs.md b/docs/AboutUs.md	(rejected hunks)
+@@ -14,6 +14,7 @@
+ <<<<<<< HEAD
+ * In charge of   
+ =======
++* In charge of Deliverables and Deadlines
+ * In charge of Integration
+ * In charge of Logic Component
+ >>>>>>> 36505ba04c4fb5bfaddfdad7fb0e7c55f04c5691

docs/ContactUs.md

@@ -5,4 +5,4 @@
 
 * **Contributing** : We welcome pull requests. Follow the process described [here](https://github.com/oss-generic/process)
 
-* **Email us** : You can also reach us at `damith [at] comp.nus.edu.sg`
+* **Email us** : You can also reach us at ` ljsrockz [at] gmail.com `