init
Merge branch 'master' of heroku.com:heep into development

Conflicts:
	app/assets/stylesheets/application.css
	app/models/collection.rb
	app/views/collections/_form.html.erb
	app/views/collections/index.html.erb
	app/views/collections/show.html.erb
	app/views/layouts/application.html.erb
	config/database.yml
	config/routes.rb
	db/schema.rb