I suck at assembly so back to C++ we go
Merge remote-tracking branch 'origin/master'

Conflicts:
	DarkFriends/DarkFriends.cpp
	DarkFriendsInjector/MainWindow.xaml.cs