index
Merge branch 'HEAD' of https://github.com/ralampay/gemcamp.git

Conflicts:
	app/views/pages/index.html.erb
activ admin
Merge branch 'HEAD' of https://github.com/ralampay/gemcamp.git

Conflicts:
	db/schema.rb
active admin gem overviews