installed -- w00t w00t !
Merge branch 'develop' of https://github.com/conroywhitney/gringotts-client into installed
installed -- gringotts toggle partial y4y4y4y4y!!!
upgrade to 0.6.1
heroku -- adding gringotts.yml (derp)
padding around page
upgraded gringotts to 0.6.1.1 for postgresql
Merge branch 'develop' of https://github.com/conroywhitney/gringotts-client into installed

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb
	config/routes.rb
Merge branch 'develop' of https://github.com/conroywhitney/gringotts-client into installed
Merge branch 'develop' of https://github.com/conroywhitney/gringotts-client into installed
Merge branch 'master' of https://github.com/conroywhitney/gringotts-client into installed
w00t -- point Gemfile to rubygems instead of git
Merge branch 'installed'
style -- updated semantic-ui; font file references for asset pipeline
db -- schema -- index created with rake db:migrate
config -- secret token default xxxx in development/test