blub
Merge branch 'master' of https://github.com/LikeHoo/HotWire
Merge branch 'master' of https://github.com/LikeHoo/HotWire

Conflicts:
	XnaHotWire/XnaHotWire/XnaHotWire/HotWire.cs