Conflicts:
	.gitignore
	app/config/app.php
	app/config/auth.php
	app/config/database.php
	app/config/queue.php
	app/config/session.php
	app/config/view.php
	app/controllers/BaseController.php
	app/database/seeds/DatabaseSeeder.php
	app/filters.php
	app/lang/en/reminders.php
	app/lang/en/validation.php
	app/models/User.php
	app/routes.php
	app/start/artisan.php
	app/start/global.php
	app/start/local.php
	app/tests/TestCase.php
	artisan
	bootstrap/start.php
	composer.json
	phpunit.xml
	public/.htaccess
	public/index.php
	public/robots.txt