initial commit
Merge branch 'master' of https://github.com/karo1205/ass1

Conflicts:
	.gitignore