modified:   Main.html
	modified:   MainController.js
	new file:   handl
	modified:   music.json
	new file:   startup.sh
	modified:   Main.html
	modified:   MainController.js
	modified:   app.js
	new file:   getdata.php
	modified:   music.json
init
asda
ss
Merge branch 'master' of https://github.com/rquinterof/angular

Conflicts:
	MainController.js
	music.json

	modified:   Main.html
	modified:   MainController.js
	modified:   app.js
	new file:   getdata.json
	modified:   music.json