diff --git a/4.Project Management/Planning.lyx b/4.Project Management/Planning.lyx
index e5a66c0..1be3773 100644
--- a/4.Project Management/Planning.lyx	
+++ b/4.Project Management/Planning.lyx	
@@ -4756,7 +4756,11 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Tabular
+<<<<<<< HEAD
 <lyxtabular version="3" rows="5" columns="5">
+=======
+<lyxtabular version="3" rows="4" columns="5">
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 <features tabularvalignment="middle" tabularwidth="75page%">
 <column alignment="center" valignment="top" width="0pt">
 <column alignment="center" valignment="middle" width="15page%">
@@ -4764,7 +4768,11 @@ status open
 <column alignment="center" valignment="middle" width="15page%">
 <column alignment="center" valignment="middle" width="15page%">
 <row topspace="2pt" bottomspace="2pt">
+<<<<<<< HEAD
 <cell multirow="3" alignment="center" valignment="top" usebox="none">
+=======
+<cell alignment="center" valignment="top" usebox="none">
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -4775,56 +4783,9 @@ Member
 
 \end_inset
 </cell>
+<<<<<<< HEAD
 <cell multicolumn="1" alignment="center" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\series bold
-\bar under
-16/10/16 to 13/11/16
-\end_layout
-
-\end_inset
-</cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topspace="2pt" bottomspace="2pt">
-<cell multirow="4" alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
+=======
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
@@ -4868,7 +4829,7 @@ Member
 \begin_inset Formula $4^{th}$
 \end_inset
 
-week
+ week
 \end_layout
 
 \end_inset
@@ -4925,11 +4886,16 @@ Alloy, Revision
 </row>
 <row topspace="2pt" bottomspace="2pt">
 <cell alignment="center" valignment="top" usebox="none">
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 \begin_inset Text
 
 \begin_layout Plain Layout
 
 \series bold
+<<<<<<< HEAD
+\bar under
+16/10/16 to 13/11/16
+=======
 De
 \series default
  
@@ -4971,6 +4937,332 @@ Use Case Diagram, Class Diagram
 
 \begin_layout Plain Layout
 Alloy, Revision
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<<<<<<< HEAD
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+=======
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+<<<<<<< HEAD
+=======
+\series bold
+Rinaldi
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<<<<<<< HEAD
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+=======
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Introduction
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Scenarios
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<<<<<<< HEAD
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+=======
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Use Case Diagram, Class Diagram
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Alloy, Revision
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<<<<<<< HEAD
+<row topspace="2pt" bottomspace="2pt">
+<cell multirow="4" alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+=======
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+
+\series bold
+RASD:
+\series default
+ Resource Allocation from 
+\shape slanted
+16/10/16
+\shape default
+ to 
+\shape slanted
+13/11/16
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float table
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="5">
+<features tabularvalignment="middle" tabularwidth="75page%">
+<column alignment="center" valignment="top" width="0pt">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+<<<<<<< HEAD
+=======
+\series bold
+Member
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $1^{st}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $2^{nd}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $3^{rd}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $4^{th}$
+\end_inset
+
+<<<<<<< HEAD
+week
+=======
+ week
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Colaci
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Introduction
+=======
+Architectural Design
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Description
+=======
+Architectural Design
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Models, Use Case Diagram
+=======
+User Interface
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Alloy, Revision
+=======
+Revision
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+De
+\series default
+ 
+\series bold
+Pasquale
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Introduction
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Specific Requirements
+=======
+Architectural Design
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Use Case Diagram, Class Diagram
+=======
+Algorithms
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Alloy, Revision
+=======
+Revision
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 \end_layout
 
 \end_inset
@@ -4991,17 +5283,276 @@ Rinaldi
 <cell alignment="center" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Introduction
+=======
+Architectural Design
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Scenarios
+=======
+Algorithms
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Use Case Diagram, Class Diagram
+=======
+User Interface
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+<<<<<<< HEAD
+Alloy, Revision
+=======
+Revision
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+
+\series bold
+Design Document:
+\series default
+ Resource Allocation from 
+\shape slanted
+14/11/16
+\shape default
+ to 
+\shape slanted
+11/12/16
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float table
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="5">
+<features tabularvalignment="middle" tabularwidth="75page%">
+<column alignment="center" valignment="top" width="0pt">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<column alignment="center" valignment="middle" width="15page%">
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Member
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $1^{st}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $2^{nd}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $3^{rd}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $4^{th}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Colaci
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
 \begin_layout Plain Layout
 Introduction
 \end_layout
 
 \end_inset
 </cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Individual Steps
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Revision
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+De
+\series default
+ 
+\series bold
+Pasquale
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Integration Strategy
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Test / Tools Descriptions
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Revision
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
 <cell alignment="center" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-Scenarios
+
+\series bold
+Rinaldi
 \end_layout
 
 \end_inset
@@ -5010,7 +5561,7 @@ Scenarios
 \begin_inset Text
 
 \begin_layout Plain Layout
-Use Case Diagram, Class Diagram
+Integration Strategy
 \end_layout
 
 \end_inset
@@ -5019,7 +5570,169 @@ Use Case Diagram, Class Diagram
 \begin_inset Text
 
 \begin_layout Plain Layout
-Alloy, Revision
+Program Stubs and Test Data Required
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Revision
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+
+\series bold
+ITPD:
+\series default
+ Resource Allocation from 
+\shape slanted
+12/12/16
+\shape default
+ to 
+\shape slanted
+15/01/17
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float table
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Tabular
+<lyxtabular version="3" rows="4" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0pt">
+<column alignment="center" valignment="middle" width="0pt">
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Member
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Formula $1^{st}$
+\end_inset
+
+ week
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Colaci
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+ COCOMO, Risks
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+De
+\series default
+ 
+\series bold
+Pasquale
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Tasks scheduling, Resource Allocation
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="2pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+
+\series bold
+Rinaldi
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Function Points, COCOMO
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 \end_layout
 
 \end_inset
@@ -5038,9 +5751,21 @@ Alloy, Revision
 \begin_layout Plain Layout
 
 \series bold
+<<<<<<< HEAD
 RASD
 \series default
  Resource Allocation
+=======
+Planning:
+\series default
+ Resource Allocation from 
+\shape slanted
+16/01/17
+\shape default
+ to 
+\shape slanted
+22/01/17
+>>>>>>> 858923ab5ae3202bd5063c5d3288f16da80b1fbb
 \end_layout
 
 \end_inset