Merge branch 'master' of http://github.com/epoch/codium into add_member_to_project
adding member to edit project page
Merge branch 'master' into add_member_to_project

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' into add_member_to_project
user can add and remove memberships on project edit page
manually conflicts solved
Merge pull request #26 from fedetaglia/add_member_to_project

Add member to project
removed image column from projects, images will be handled by paperclip and aws
Uploading image for users and projects
Merge pull request #28 from elitenomad/uploadimage

Uploading image for users and projects
Merge branch 'marcus' of https://github.com/MollyMoile/codium into MollyMoile-marcus

remove image column from projects

Conflicts:
	db/schema.rb