Test
Merge branch 'master' of https://github.com/Rastur/guild.me

Conflicts:
	.gitignore
	app/Http/routes.php