Rename the merge method to collapse.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Add merge method to merge in another array or collection.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Updated readme.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge branch 'master' of git://github.com/laravel/framework into fix/proper-merge-collections

Conflicts:
	readme.md
Add "reverse" method to Collection.
Remove Windows carriage return chars from Package
Merge pull request #1252 from KaneCohen/package

Remove Windows carriage return chars from Package
Fix textarea name setting. Closes #1161.
Merge pull request #1174 from jasonlewis/fix/proper-merge-collections

Allow merge to actually merge in another array or collection.
Make reverse return new Collection instance.
Merge pull request #1251 from KaneCohen/reverse

Add "reverse" method to Collection.
Simplify Eloquent collections.
Fix timestamps in MySQL.
Fixing tests.
Fix hyphens in resource routes. Autocorrect to underscores for placeholders.