Merge branch 'develop'
Adding in search function
Editing Archives layout
Merge branch 'master' into develop