Merge branch 'master' of https://github.com/linyongji/Alogrithm_git into 1

# Conflicts:
#	.gitignore
#	Alogrithm/.vs/Alogrithm/v16/.suo
#	Alogrithm/Alogrithm/Alogrithm.vcxproj
#	Alogrithm/Alogrithm/Alogrithm.vcxproj.filters

.gitignore

@@ -51,3 +51,8 @@ Alogrithm/Debug/Alogrithm.ilk
 Alogrithm/Debug/Alogrithm.pdb
 Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/7845411b3bb098f4/3_BOOL ISUGLY.ipch
 Alogrithm/Alogrithm/Debug/3_bool IsUgly.obj
+Alogrithm/.vs/Alogrithm/v16/Browse.VC.db-shm
+Alogrithm/.vs/Alogrithm/v16/Browse.VC.db-wal
+Alogrithm/.vs/Alogrithm/v16/Browse.VC.opendb
+Alogrithm/.vs/Alogrithm/v16/Solution.VC.db-shm
+Alogrithm/.vs/Alogrithm/v16/Solution.VC.db-wal