Fixed merge conflicts pulling from origin.
Merge branch 'master' of https://github.com/acquaman/acquaman