Initial commit
Merge branch 'master' of github.com:nameghino/lab1-012013

Conflicts:
	.gitignore