changed wording on home page
Merge origin/master