Initial commit
Initial commit
Merging from github
First creation foundation entities
Fixing merge