Asset update
Crash fix
Merge branch 'master' of https://github.com/sircuddles/SvS

Conflicts:
	SvS/main.cpp
WTF GITHUB
Merge branch 'master' of https://github.com/sircuddles/SvS