Initial
Merge branch 'develop' of github.com:BeefboosterDevelopment/Intranet

Conflicts:
	.gitignore
remove first try
Merge branch 'develop' of github.com:BeefboosterDevelopment/Intranet
first commit (again)