merged, finished adding spell management properly
fixed gitignore