Adding the initial code project and tamplate, without persistence, for now.
Solving merge conflict