First Commit
Test Commit

beta_template and test.php
Third Commit

css
Merge branch 'master' of https://www.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
Fourth Test Commit