Merge branch 'master' of https://github.com/cmester0/Xamplicity.git
Merge branch 'master' of https://github.com/cmester0/Xamplicity.git