a
Merge branch 'master' of github.com:kevinluo201/tarots

Conflicts:
	lib/store.rb