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
Added create skill feature. No errors but working correctly
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
Added catch-all to routes, re-positioned lines in routes.rb, created blogfeed action and view, wrote tests for pages controller
rss collects posts from one source, tests arent passing yet
new styles
Merge branch 'master' into postDevel
policy management
Seek jobs functionality
team page frontend
started styling student profile page (users show)
RSS working, tests failing
fixed conflicts