Initial commit
Merge branch 'master' of https://github.com/poupen/Asg1

Conflicts:
	README.md