Some work on the gitignore
Merge branch 'master' of github.com:/Mrknister/jjypd
merging branches
no project files are to be commited
Don't overwrite the CMakeLists.txt in the project source directory. This one is intended as it is. To fix the syntax errors it is required to use the modern qt5 api and change the source code accordingly. Don't fuck with my fucking CMakeLists.txt. Otherwise I will murder you in your sleep to sacrefice you to satan.