updated/formatted proposal.pdf
Merge http://github.com/umass-cs-326/team-uframe

The only thing i changed was that I replaced proposal.pdf