Revert "43"

This reverts commit 94c82abcff3379fe9169ea334f7d99885bd23d77.
Merge branch 'master' of https://github.com/MarcusBergman/Live