moar hodor
moar hodor
no hodors
lolol
Merge branch 'master' of https://github.com/Ondalys/Projekt-Soundz.git
sfrsdgrd
test
Merge branch 'master' of https://github.com/Ondalys/Projekt-Soundz.git

Conflicts:
	Soundz/TEST
aaa
hodor
Removed Pictures
Merge remote-tracking branch 'origin/Playback' into TEST

Conflicts:
	Soundz/res/layout/activity_main.xml
	Soundz/res/values/strings.xml