register Personal/Firma
update
update clear
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/main.html
	bootstrap/Typographie_Code.html
	bootstrap/css/app.css
	css/main.css
	css/styles.css
	dokumentation/Lerndokumentation.docx
	dokumentation/Plannung_WebApplikation.docx
	javascript/app.js
	login.html
	login/formular.php
	register/register.php