this commit is like a blowjob
Merge branch 'master' of https://github.com/psicomante/uav-ai-clips

Conflicts:
	.gitignore
	Monitor/Monitor/bin/x86/Debug/Monitor.exe
	Monitor/Monitor/bin/x86/Debug/Monitor.pdb
	Monitor/Monitor/obj/x86/Debug/MainWindow.baml
	Monitor/Monitor/obj/x86/Debug/MainWindow.g.cs
	Monitor/Monitor/obj/x86/Debug/MainWindow.g.i.cs
	Monitor/Monitor/obj/x86/Debug/Monitor.exe
	Monitor/Monitor/obj/x86/Debug/Monitor.g.resources
	Monitor/Monitor/obj/x86/Debug/Monitor.pdb
update gitignore