init rails
Merge branch 'master' of github.com:pawelnguyen/bitmarket

Conflicts:
	.gitignore