Changed database.yml to timproctor
save to pull
Merge branch 'search-bar'

Conflicts:
	Gemfile
Merge branch 'database-yml' of github.com:121watts/the_pivot
Merge branch 'database-yml' of github.com:121watts/the_pivot
Deleted old loan index content
fix some tests
Fixed broken specs except models
Merge branch 'master' of github.com:121watts/the_pivot
Cleared specs, implemented search-bar
fixed merge conflicts
fixed merge conflicts
save before merge with master
Merge branch 'master' of github.com:121watts/the_pivot into front-end
Set loan-box height and bottom pad
Modified loan-box description
shortened images within box
Moved title of loan down
moved progress bar, amount, and loan loan button
Moved loan title down