Took out fiagro, and hardcoded keys temporarily
Merge branch 'master' into admin

Conflicts:
	Gemfile
added prices to our subscription model
Merge branch 'master' of https://github.com/mohamedfarazi/project_beer
Merge branch 'admin'

Conflicts:
	db/schema.rb