Adding gemfile and removing gemfile type from git
Deleted conflict
Deleted conflict
Fix
Adding puts functionality to app controller
Merge remote-tracking branch 'origin/html_views_design' into html_views

Conflicts:
	dbcoverflow.rb
Implement postgres as model's database
Merge remote-tracking branch 'origin/postgres_with_sinatra' into html_views
shamefully, I forgot what I did here.
Added postgres gem to gemfile. Fixed broken controller
Created help page and login page without links
Fixed conflict issues on file