Video after rebasing...
Merge branch 'master' of github.com:imasonaz/CalHacks
I was behind by one commit remotely, so I merged am and attempting to push.