Fix merge conflict.
Merge branch 'beta'
Merge branch 'master' of https://github.com/reesmichael1/WebWhirr
Merge branch 'beta'