Initial commit
Pypackage made
Small change for gitignore and conflict fix