Merge branch 'master' of http://github.com/ndomar/megasoft-13 into Cardsort_ReviewerView

Conflicts:
	Rails/WebsitesPrototypeBuilder/config/routes.rb
	Rails/WebsitesPrototypeBuilder/db/seeds.rb
updating to master
updating to master
redoced
fixing open cardsort bug
imporved ui
improving ui
finishing touches
Merge branch 'Cardsort_ReviewerView' of http://github.com/ndomar/megasoft-13 into Cardsort_ReviewerView

Conflicts:
	Rails/WebsitesPrototypeBuilder/config/routes.rb
final touches
Merge branch 'master' of http://github.com/ndomar/megasoft-13 into Cardsort_DesignerView

Conflicts:
	Rails/WebsitesPrototypeBuilder/config/routes.rb
	Rails/WebsitesPrototypeBuilder/db/seeds.rb
updating to master
update to master
Update cardsorts_controller.rb
redoced
Merge branch 'Cardsort_DesignerView' of http://github.com/ndomar/megasoft-13 into Cardsort_DesignerView
UML
UML
add create cardsort
Merge branch 'Cardsort_DesignerView' of http://github.com/ndomar/megasoft-13 into CreateCardsort

Conflicts:
	Rails/WebsitesPrototypeBuilder/app/assets/stylesheets/cardsorts.css
	Rails/WebsitesPrototypeBuilder/app/views/cardsorts/review.html.erb
	Rails/WebsitesPrototypeBuilder/config/routes.rb