modified edit link in view profile to contain uppercase E
Merge branch 'master' of https://github.com/epoch/codium
Merge branch 'master' of https://github.com/epoch/codium
created post member relationship
updated models
merged conflicts

Merge branch 'master' into postDevel

Conflicts:
	db/schema.rb
fix posts form
Merge branch 'master' of https://github.com/epoch/codium

Conflicts:
	app/views/users/show.html.erb
Merge branch 'master' into alberto

Conflicts:
	app/views/posts/_form.html.erb
new styles
Merge branch 'master' into postDevel
Merge branch 'master' into marcus
fixed some tests
policy management
Seek jobs functionality
team page frontend
Merge branch 'master' into marcus
more styles
merge conflicts
include require gems

Merge branch 'master' of github.com:epoch/codium

Conflicts:
	Gemfile