new
Merge branch 'master' of https://github.com/xfate/WaveGame

Conflicts:
	.gitignore
	WaveGame/WaveApp.cpp
	WaveGame/WaveApp.h
	WaveGame/WaveGame.vcxproj
	WaveGame/WaveGame.vcxproj.filters
1