remove conque
merge
add global gitignore, fix spacing