added TODO's and some changes to FMOD to release the hardware when the program finish
add merge
resolving merge!
Merge branch 'master' of https://github.com/darak1313/The-Legend-of-Zelda

Conflicts:
	cPlayer.cpp