close #6
Merge branch 'master' of https://github.com/sunsidew/MelonAPI

Conflicts:
	src/com/json/parse/ParseJsonObject.java
	src/com/simple/melon/Album.java
	src/com/simple/melon/Artist.java
	src/com/simple/melon/Genre.java
	src/com/simple/melon/Song.java