Initial Commit
Merge https://github.com/milardovich/academia-NET

Conflicts:
	.gitignore