finished basic project
Merged .gitignores