2907morn
Merge branch 'master' of https://github.com/juleswhite/mobilecloud-14

Conflicts:
	assignments/Asgn1-VideoUp/README.md
- Updated the README to remove confusing language around how many
  @RequestMapping annotations are needed
- Updated the information on how to start the application
- Took Asgn2 out of beta
Merge branch 'master' of https://github.com/juleswhite/mobilecloud-14
Merge branch 'master' of https://github.com/jith912/MobileCloud

Conflicts:
	assignments/Asgn1-VideoUp/src/main/java/org/magnum/dataup/VideoSvc.java