updated .gitignore and added basic setup.py
fixed merge error
added setup.py