updated git ignore
remove ignored files
conflicts
this thing sucks at recognizing unresolved conflicts
Rework on stuff that got lost