merge issues
Fixed merge issues, need to fix the gitignore for PycharmsProjects