First commit
Merge project from github with my local one