First commit
First commit
Commit
Commit
Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/jan/janmusicplayer/MainActivity.java
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	gradlew
Commit