Updates
Merge branch 'master' of https://github.com/BrianSahagun/hopscotch-wp

Conflicts:
	css/app.css