Haha
config files
Merge branch 'master' of https://github.com/kailashnagarkoti/Javatunes

Conflicts:
	JavatunesCapstone/src/com/capstone/Javatunes.java
Merge branch 'master' of https://github.com/kailashnagarkoti/Javatunes
syso master
syso master
Merge branch 'master' of https://github.com/kailashnagarkoti/Javatunes
syso master