Initial commit.
Merge branch 'master' of github.com:pla1/sda

Conflicts:
	.gitignore