The first Commit
First Commit?
Poop change
theFirstCommit
firstcommit...?
Merge branch 'master' of https://github.com/ricardomorales/thefirstfivepages

Conflicts:
	.gitattributes
	.gitignore
	app/config/app.php
	app/config/database.php
	app/routes.php
	app/views/hello.php
	artisan
	composer.json
	vendor/composer/installed.json
	vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php
	vendor/laravel/framework/composer.json
	vendor/laravel/framework/src/Illuminate/Workbench/stubs/gitignore.txt
	vendor/swiftmailer/swiftmailer/LICENSE
	vendor/swiftmailer/swiftmailer/README
	vendor/swiftmailer/swiftmailer/test-suite/README