Merge pull request #23 from bsharanya/master

Fixed file upload problem
Merge pull request #24 from bsharanya/master

changed the aws upload url
Merge pull request #25 from bsharanya/master

Fixed rubric display
Made minor changes based on feedback
Merge remote-tracking branch 'niloa-master/master'