a
Merge branch 'master' of https://github.com/eyanai/hop

Conflicts:
	wp-content/themes/hop/css/main.css
	wp-content/themes/hop/style.css
a
Merge branch 'master' of https://github.com/eyanai/hop
a
Merge branch 'master' of https://github.com/eyanai/hop