no .log files plox
merge resolution?
hack to get me a gitignore
Fixed some stuff