added login / register pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/template.blade.php