Merge branch 'reviewer_info_reviewer_tables' of http://github.com/ndomar/megasoft-13
Merge branch 'master' of http://github.com/ndomar/megasoft-13
Merge branch 'master' of http://github.com/ndomar/megasoft-13
Merge branch 'master' of http://github.com/ndomar/megasoft-13
clean up
small modifications
adding project id to edit_steps
Merge pull request #258 from ndomar/C2S2_FixingPO1

adding project id to edit_steps
Merge branch 'master_PO' of http://github.com/ndomar/megasoft-13 into Cardsort_DesignerView
Merge pull request #259 from ndomar/Cardsort_DesignerView

Cardsort designer view
Merge branch 'master' of http://github.com/ndomar/megasoft-13
Merge branch 'master_PO' of http://github.com/ndomar/megasoft-13

Conflicts:
	Rails/WebsitesPrototypeBuilder/app/models/project.rb
	Rails/WebsitesPrototypeBuilder/config/routes.rb
removing tempn
Merge pull request #275 from ndomar/fixing_master

Fixing master
updated with master