init
init
init
diff --git a/RTSLab1.suo b/RTSLab1.suo
index a9814fd..42e489f 100644
Binary files a/RTSLab1.suo and b/RTSLab1.suo differ
Merge branch 'master' of https://github.com/Logrus/RTSLab

Conflicts:
	.gitignore