Merged in the changes.
Merge branch 'vivek/global-line-list' of github.com:VivekNair/CS224U-StageCoach into vivek/global-line-list
Committing and going to pull down the latest changes
Fixed the  merge conflicts and can pull the rest of the changes