Project Created!
Merge pull request #1 from adya/master

Modeling
Some changes
Changes to resolve merge conflict
another merge conflict resolve
fixes before merging
Merge branch 'master' of https://github.com/adya/YAMP into adya-master

Conflicts:
	YAMPProject/.idea/gradle.xml
Audio library fragment commit
Update README.md

markup changed
Update README.md

changed again...
scanning the device for music
scanning the device for music
Merge branch 'adya-master'
Merge branch 'master' of https://github.com/VAlux/YAMP
Merge pull request #12 from adya/master

Missed layouts
Merge pull request #13 from adya/master

Additions in the Class Architecture.
Merge pull request #14 from adya/master

All base playing functionality has been implemented.
Little fixes and Modeling State Artifact
Merge remote-tracking branch 'upstream/master'