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

Conflicts:
	wp-content/plugins/hop-plugin/css/main.css
form - top part
Merge branch 'master' of https://github.com/eyanai/hop