Alex's Manifest 8:12
manifest file 8:32
Merge remote-tracking branch 'upstream/master'
monitor 9:25
11
Merge pull request #1 from aharelick/master

Merging at 12:02