Add basic python file and git ignore file
Add properties file
Fix merge conflicts
Re-insert git ignore