done
Merge branch 'beta' of github.com:tekknolagi/bitpoker
Rails init
Using postgre
Merge branch 'master' into beta

Conflicts:
	backend/cards.rb