Added gitignore
Removed all junk
Some merge