0001. Add CURL library to json
Merge branch 'master' of https://github.com/binary-academy-php2014/laravel-and-music-and-more

Conflicts:
	.gitignore
	app/config/app.php
	app/config/database.php
	app/models/User.php
	app/routes.php
	composer.json
	index.php
fix conflicts

	modified:   app/config/app.php
	modified:   app/config/database.php
	modified:   app/models/Credential.php
	modified:   app/models/Social.php
	modified:   app/models/User.php
	modified:   app/routes.php
	modified:   composer.json
0007: set foreign keys to unsigned
fix app.php
add app.php to .gitignore
Fixed conflict in composer.json
Resolved db config conflict
Fixed index.php file from merge consequences:)
add database.php to .gitignore
Merge branch 'master' of https://github.com/binary-academy-php2014/laravel-and-music-and-more
continue with changes in master