change to postgres database
add clearance user attributes
Merge branch 'master' of https://github.com/janetchang/wodlandia

Conflicts:
	Gemfile
	db/schema.rb
delete extra gemfile
migrate to postgres, setup heroku
make LESS work with bootstrap
Merge branch 'master' of https://github.com/janetchang/wodlandia

Conflicts:
	Gemfile
	Gemfile.lock