Initial commit
Merge branch 'master' of github.com:rosarior/crypto_project

Conflicts:
	.gitignore