Kadic Talks alpha 1.0
Merge branch 'master' of https://github.com/nkasozi/Forum-Stuff.git

Conflicts:
	KadicTalks/laravel/app/routes.php