initial commit
Merge branch 'master' of github.com:fagianijunior/intranet

Conflicts:
	.gitignore

initial commit