hehe
Add gitignore
Fix merge
Start from scratch

Let's ignore all of that Python crap for now