Enabled manual alignment mode
.gitignore is now working
add log folder to the structure
solve utf-8 problem
solve conflict between head and remote branch