initial commit
Merge branch 'master' of github.com:pestlett/pokerapp

Conflicts:
	app/styles/main.scss