delete extra readme
Merge branch 'master' of https://github.com/janetchang/wodlandia
Upgrade ./bin.
Kill .DS_Store.
scaffold generated files, bootstrap view files
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
Add basic client for human/api.
Add pry, shotgun, and thin.
migrate to postgres, setup heroku
make LESS work with bootstrap
Merge branch 'master' of https://github.com/janetchang/wodlandia

Conflicts:
	Gemfile
	Gemfile.lock
upgrade bin
vendor compiled assets
use ruby racer for all environments
Add auth controller for human/api.
Merge branch 'master' of https://github.com/janetchang/wodlandia
setup home page redirect