user testing started
user/program test stuff
Merge branch 'master' of https://github.com/sankalpk/gelfand
Merge branch 'master' of https://github.com/sankalpk/gelfand
made the user crap actually allow the page to display without errors.
In the Prog show page: A user can make an affiliation between an Org and Prog.
Fixed small issue?
Fixed small issue?
Took out print checks. Added only necessary routes for affiliations
Changed slightly content and css on side-nav in organizations index
Added and installed nested_form gem
Made some progress on nested form for when creating new program but an Affiliation is still not created on program_new page
Added currently associated orgs in Program show
Added in fields to Programs that were previously deleted
When creating a program still cannot make affiliation. Decided to make affiliation only in program show page
In Prog. show page after creating a program, User can add an Affiliation to an Org
did some work on programs
Merge pull request #71 from psethu/master

Affiliation between Organization and Program
merge conflict fixed
Merge remote-tracking branch 'upstream/master'