starting on show action
added haml-coffee templates and testing
removed new view
fixed form error
Merge branch 'refs/heads/backbone' into heroku-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/templates/documents/document.hamlc
	app/assets/templates/documents/index.hamlc
added junk to git ignore
fixed bad merge
Merge branch 'master' of heroku.com:bacon-app

Conflicts:
	Gemfile.lock
added gemfile lock
removed hamlcoffee
removed postgres from production
edited db.yml
added line to config
added hamlcoffee back in
cleaning up
fixed search bar new view
looking nice, working well