Basic Template Updated
Merging
Home Updated
Merge origin/master