merge conflicts resolving
resolved merge conflicts
Fixed some errors
Fixed some errors
Added sample audio files(corrected)
Removed .ropeproject directory
Updated .gitignore - added .ropeproject to ignored files
Added initial neural networks training algorithm to detect laughter
Merge branch 'master' of https://github.com/nvnvenki/sentitude

Conflicts:
	src/main/audio/1.wav
	src/main/audio/2.wav
	src/main/audio/3.wav
	src/main/audio/4.wav
	src/main/audio/5.wav
	src/main/audio/6.wav
	src/main/audio/7.wav
	src/main/audio/8.wav
	src/main/sentitude/feature_extraction/featureExtractor.py
Added N venkatesh Naiks neural networks code