Initial commit
Fresh install of Laravel Framework v4.2
Merge branch 'master' of https://github.com/d3cr1pt0r/web-hairsaloon

Conflicts:
	CONTRIBUTING.md
	app/commands/.gitkeep
	app/config/app.php
	app/config/auth.php
	app/config/cache.php
	app/config/compile.php
	app/config/database.php
	app/config/local/app.php
	app/config/local/database.php
	app/config/mail.php
	app/config/packages/.gitkeep
	app/config/queue.php
	app/config/remote.php
	app/config/services.php
	app/config/session.php
	app/config/testing/cache.php
	app/config/testing/session.php
	app/config/view.php
	app/config/workbench.php
	app/controllers/.gitkeep
	app/controllers/BaseController.php
	app/controllers/HomeController.php
	app/database/migrations/.gitkeep
	app/database/production.sqlite
	app/database/seeds/.gitkeep
	app/database/seeds/DatabaseSeeder.php
	app/filters.php
	app/lang/en/pagination.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/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	app/tests/ExampleTest.php
	app/tests/TestCase.php
	artisan
	bootstrap/autoload.php
	bootstrap/paths.php
	bootstrap/start.php
	composer.json
	phpunit.xml
	public/.htaccess
	public/favicon.ico
	public/index.php
	public/packages/.gitkeep
	public/robots.txt
	server.php
Established a working framework