Initial commit
Merge branch 'master' of github.com:martinrybak/Homework2

Conflicts:
	.gitignore