Fixed homepage feature
Cleared conflicts
Merge branch 'master' of github.com:BrandonWLee/wisdomsun