changed user and company model
Merge pull request #27 from Ajhandler/config

Add user_id to company table and remove company_id from user table
change db
Merge pull request #28 from Ajhandler/companyview

Companyview
merge
fixed conflicts
pull dev
user can log in, create company. company and user associated
add template conroller and view
Merge pull request #32 from Ajhandler/companiesview

Companiesview
Start work on paperclip gem
Fix merge errors