Added forem with link_to
styled it up
Saving state for merge.
Remove old mergefiles.
Merge remote-tracking branch 'origin/forem'

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/pages/index.html.haml
	app/views/users/show.html.erb
	db/schema.rb
Remove merge relic.