Resolving push conflicts
generated profile
Created profile pages
Resolving merge conflicts
Merge branch 'display' of https://github.com/cposner/housing into display
ADKLSA
fixed the goddamn gray error
Currently managing routes
home page
okay Merge branch 'display' of https://github.com/cposner/housing into display
suppress confirm email
suppress confirm email
Resolving conflicts
checking if git works
Revert "Resolving conflicts"

This reverts commit 8d51ede72c93cdaba6214794b36702e06b77c230.
We have a funcioning profile page!
Resolving merge conflicts
Beginning the structure of the client page
Revert "client model"

This reverts commit 0d98abe255447ef14c6ca5ce02f0284959e27be9.

Conflicts:
	app/models/client.rb
	db/schema.rb

okay
ok Merge branch 'display' of https://github.com/cposner/housing into display